Fix raw ip tests

[stg.git] / projects / sgconf / Makefile

diff --git a/projects/sgconf/Makefile b/projects/sgconf/Makefile
index 6cc8962f99fc6e811db4fc2d960c0aecf2982fe3..02f8d7b80bbe4b6e81ce13c5ced1e09a02088ec1 100644 (file)
--- a/projects/sgconf/Makefile
+++ b/projects/sgconf/Makefile
@@ -9,10 +9,10 @@ PROG = sgconf
 SRCS = ./main.cpp \
        ./common_sg.cpp
 
 SRCS = ./main.cpp \
        ./common_sg.cpp
 

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

 
 LIBS += -lexpat \
        $(LIB_THREAD)
 
 LIBS += -lexpat \
        $(LIB_THREAD)


@@ -41,7 +41,7 @@ OBJS = $(notdir $(patsubst %.cpp, %.o, $(patsubst %.c, %.o, $(SRCS))))
 CXXFLAGS += -Wall
 LDFLAGS += -Wl,-E -L$(DIR_LIB) -Wl,-rpath,$(PREFIX)/usr/lib/stg -Wl,-rpath-link,$(DIR_LIB)
 
 CXXFLAGS += -Wall
 LDFLAGS += -Wl,-E -L$(DIR_LIB) -Wl,-rpath,$(PREFIX)/usr/lib/stg -Wl,-rpath-link,$(DIR_LIB)
 

-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


@@ -50,7 +50,7 @@ libs:
        $(MAKE) -C $(DIR_LIBSRC)
 
 $(PROG): $(OBJS) $(STGLIBS)
        $(MAKE) -C $(DIR_LIBSRC)
 
 $(PROG): $(OBJS) $(STGLIBS)

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

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


@@ -69,7 +69,7 @@ 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
 

-uninstall: uninstall-bin uninstall-data
+uninstall: uninstall-bin

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