Виправлено помилки компіляції з новою структурою raw_ip_packet

[stg.git] / projects / sgconf_xml / Makefile

diff --git a/projects/sgconf_xml/Makefile b/projects/sgconf_xml/Makefile
index 168bf9f4c76e73db7af822f3f592a92766c0dc12..d0a5550c24da10d7113da7313625b21e3523506a 100644 (file)
--- a/projects/sgconf_xml/Makefile
+++ b/projects/sgconf_xml/Makefile
@@ -4,7 +4,7 @@
 
 include ../../Makefile.conf
 
 
 include ../../Makefile.conf
 

-PROG = sgconf
+PROG = sgconf_xml

 
 SRCS = ./main.cpp \
        ./parser.cpp
 
 SRCS = ./main.cpp \
        ./parser.cpp


@@ -14,32 +14,32 @@ LIBS =  -lconffiles \
         -lstg_common \
         -lsrvconf
 
         -lstg_common \
         -lsrvconf
 

-ifeq ($(OS),linux)

 LIBS += -lexpat \
 LIBS += -lexpat \

-        -lpthread \
-        -ldl
+       $(LIB_THREAD)
+
+ifeq ($(OS),linux)
+LIBS += -ldl
+else
+LIBS += -lc \
+       -liconv

 endif
 
 endif
 

+SEARCH_DIRS = -I $(DIR_INCLUDE)
+

 ifeq ($(OS),bsd)
 ifeq ($(OS),bsd)

-LIBS += -lexpat \
-        -lc_r \
-        -lc
+SEARCH_DIRS += -I/usr/local/include
+CXXFLAGS += -DHAVE_DECL_GETOPT=1

 endif
 
 ifeq ($(OS),bsd5)
 endif
 
 ifeq ($(OS),bsd5)

-LIBS += -lexpat \
-        -lc_r \
-        -lc
+SEARCH_DIRS += -I/usr/local/include
+CXXFLAGS += -DHAVE_DECL_GETOPT=1

 endif
 
 endif
 

-SEARCH_DIRS = -I $(DIR_INCLUDE)
-

 OBJS = $(notdir $(patsubst %.cpp, %.o, $(patsubst %.c, %.o, $(SRCS))))
 
 OBJS = $(notdir $(patsubst %.cpp, %.o, $(patsubst %.c, %.o, $(SRCS))))
 

-CC = g++
-
-CFLAGS += -Wall
-LDFLAGS += -Wl,-E -L$(DIR_LIB) -Wl,-rpath,$(PREFIX)/usr/lib/stg
+CXXFLAGS += -Wall
+LDFLAGS += -Wl,-E -L$(DIR_LIB) -Wl,-rpath,$(PREFIX)/usr/lib/stg -Wl,-rpath-link,$(DIR_LIB)

 
 vpath %.so $(DIR_LIB)
 
 
 vpath %.so $(DIR_LIB)
 


@@ -86,7 +86,7 @@ uninstall-data:
 ifneq ($(MAKECMDGOALS),distclean)
 ifneq ($(MAKECMDGOALS),clean)
 ifneq ($(MAKECMDGOALS),uninstall)
 ifneq ($(MAKECMDGOALS),distclean)
 ifneq ($(MAKECMDGOALS),clean)
 ifneq ($(MAKECMDGOALS),uninstall)

-include deps
+-include deps

 endif
 endif
 endif
 endif
 endif
 endif