Shut up compilers

[stg.git] / projects / sgconf_xml / Makefile

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

-PROG = sgconf
+PROG = sgconf_xml

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

-LIBS =  -lconffiles \
-        -lstg_crypto \
-        -lstg_common \
-        -lsrvconf
+LIBS =  -lstgconffiles \
+        -lstgsrvconf \
+        -lstgcrypto \
+        -lstgcommon

 
 

-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++
+CXXFLAGS += -Wall
+LDFLAGS += -Wl,-E -L$(DIR_LIB) -Wl,-rpath,$(PREFIX)/usr/lib/stg -Wl,-rpath-link,$(DIR_LIB)

 
 

-CFLAGS += -Wall
-LDFLAGS += -Wl,-E -L$(DIR_LIB) -Wl,-rpath,$(PREFIX)/usr/lib/stg
-
-vpath %.so $(DIR_LIB)
+vpath %.a $(DIR_LIB)

 
 .PHONY: all clean distclean libs install uninstall install-bin install-data uninstall-bin uninstall-data
 all: libs $(PROG) ../../Makefile.conf
 
 .PHONY: all clean distclean libs install uninstall install-bin install-data uninstall-bin uninstall-data
 all: libs $(PROG) ../../Makefile.conf


@@ -49,8 +49,8 @@ all: libs $(PROG) ../../Makefile.conf
 libs:
        $(MAKE) -C $(DIR_LIBSRC)
 
 libs:
        $(MAKE) -C $(DIR_LIBSRC)
 

-$(PROG): $(OBJS) $(LIBS)
-       $(CC) $^ $(LDFLAGS) -o $(PROG)
+$(PROG): $(OBJS) $(STGLIBS)
+       $(CXX) $^ $(LIBS) $(LDFLAGS) -o $(PROG)

 
 clean:
        rm -f deps $(PROG) *.o tags *.*~ .OS
 
 clean:
        rm -f deps $(PROG) *.o tags *.*~ .OS


@@ -69,24 +69,16 @@ install-bin:
        install -m $(BIN_MODE) -o $(OWNER) -s $(PROG) $(PREFIX)/usr/sbin/$(PROG)
        $(MAKE) -C $(DIR_LIBSRC) install
 
        install -m $(BIN_MODE) -o $(OWNER) -s $(PROG) $(PREFIX)/usr/sbin/$(PROG)
        $(MAKE) -C $(DIR_LIBSRC) install
 

-install-data:
-       # Install etc
-       install -m $(DATA_MODE) -o $(OWNER) -D $(ETC_DIR)/sgconf.conf $(PREFIX)/etc/stargazer/sgconf.conf
-

 uninstall: uninstall-bin uninstall-data
 
 uninstall-bin:
        rm -f $(PREFIX)/usr/sbin/$(PROG)
 
 uninstall: uninstall-bin uninstall-data
 
 uninstall-bin:
        rm -f $(PREFIX)/usr/sbin/$(PROG)
 

-uninstall-data:
-       # Uninstall etc
-       rm -f $(PREFIX)/etc/stargazer/sgconf.conf
-

 
 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


@@ -95,8 +87,8 @@ deps: $(SRCS) ../../Makefile.conf
        $(MAKE) -C $(DIR_LIBSRC) includes
        @>deps ;\
        for file in $(SRCS); do\
        $(MAKE) -C $(DIR_LIBSRC) includes
        @>deps ;\
        for file in $(SRCS); do\

-         echo "`$(CC) $(CFLAGS) $(SEARCH_DIRS) -MM $$file` Makefile" >> deps ;\
-         echo -e '\t$$(CC) -c $$< $(CFLAGS) $(SEARCH_DIRS) $(DEFS)' >> deps ;\
+         echo "`$(CC) $(CXXFLAGS) $(SEARCH_DIRS) -MM $$file` Makefile" >> deps ;\
+         echo -e '\t$$(CC) -c $$< $(CXXFLAGS) $(SEARCH_DIRS) $(DEFS)' >> deps ;\

        done
 
 
        done