Fix projects and plugins building system to support new libs

[stg.git] / projects / rlm_stg / Makefile

diff --git a/projects/rlm_stg/Makefile b/projects/rlm_stg/Makefile
index deaf437e0e85b128ccb2005ec170a4c4a8da882b..0c9d8a6415f45e6631908b7e37e1cc729b650702 100644 (file)
--- a/projects/rlm_stg/Makefile
+++ b/projects/rlm_stg/Makefile
@@ -11,10 +11,13 @@ PROG = $(LIB_NAME).so
 SRCS = ./rlm_stg.cpp \
        ./stg_client.cpp
 
-STGLIBS = -lstg_common \
-          -lstg_crypto
+STGLIBS = common \
+          crypto
 
-LIBS += $(LIB_THREAD)
+STGLIBS_INCS = $(addprefix -I ../../stglibs/,$(addsuffix .lib/include,$(STGLIBS)))
+STGLIBS_LIBS = $(addprefix -L ../../stglibs/,$(addsuffix .lib,$(STGLIBS)))
+
+LIBS += $(LIB_THREAD) $(addprefix -lstg,$(STGLIBS))
 
 ifeq ($(OS),linux)
 LIBS += -ldl
@@ -23,14 +26,13 @@ LIBS += -lintl \
         -lc
 endif
 
-SEARCH_DIRS = -I $(DIR_INCLUDE)
+SEARCH_DIRS = -I ../../include
 
 OBJS = $(notdir $(patsubst %.cpp, %.o, $(patsubst %.c, %.o, $(SRCS))))
 
-CXXFLAGS += -Wall -fPIC -I./ 
-LDFLAGS += -shared -L$(DIR_LIB) -Wl,-rpath,$(PREFIX)/usr/lib/stg
-
-vpath %.so $(DIR_LIB)
+CXXFLAGS += -fPIC $(DEFS) $(STGLIBS_INCS) $(SEARCH_DIRS)
+CFLAGS += $(DEFS) $(STGLIBS_INCS) $(SEARCH_DIRS)
+LDFLAGS += -shared -Wl,-rpath,$(PREFIX)/usr/lib/stg -Wl,-E $(STGLIBS_LIBS)
 
 .PHONY: all clean distclean libs install uninstall install-bin uninstall-bin
 all: libs $(PROG) ../../Makefile.conf
@@ -38,8 +40,8 @@ all: libs $(PROG) ../../Makefile.conf
 libs:
        $(MAKE) -C $(DIR_LIBSRC)
 
-$(PROG): $(OBJS) $(STGLIBS) 
-       $(CC) $^ $(LDFLAGS) -o $(PROG) $(LIBS)
+$(PROG): $(OBJS)
+       $(CXX) $^ $(LDFLAGS) -o $(PROG) $(LIBS)
 
 clean:
        rm -f deps $(PROG) *.o tags *.*~ .OS
@@ -53,14 +55,13 @@ distclean: clean
 install: install-bin
 
 install-bin:
-       mkdir -m $(BIN_MODE) -p $(PREFIX)/usr/lib
        install -m $(BIN_MODE) -o $(OWNER) -s $(PROG) $(PREFIX)/usr/lib/$(PROG)
        $(MAKE) -C $(DIR_LIBSRC) install
 
 uninstall: uninstall-bin
 
 uninstall-bin:
-       rm -f $(PREFIX)/usr/sbin/$(PROG)
+       rm -f $(PREFIX)/usr/lib/$(PROG)
 
 ifneq ($(MAKECMDGOALS),distclean)
 ifneq ($(MAKECMDGOALS),clean)
@@ -71,11 +72,11 @@ endif
 endif
 
 deps:  $(SRCS) ../../Makefile.conf
-       $(MAKE) -C $(DIR_LIBSRC) includes
+       $(MAKE) -C $(DIR_LIBSRC)
        @>deps ;\
        for file in $(SRCS); do\
-         echo "`$(CC) $(CXXFLAGS) $(SEARCH_DIRS) -MM $$file` Makefile" >> deps ;\
-         echo -e '\t$$(CC) -c $$< $(CXXFLAGS) $(SEARCH_DIRS) $(DEFS)' >> deps ;\
+         echo "`$(CC) $(CXXFLAGS) -MM $$file` Makefile" >> deps ;\
+         echo -e '\t$$(CC) -c $$< $(CXXFLAGS)' >> deps ;\
        done