Merge branch 'new-daily-fee'

[stg.git] / projects / rlm_stg / Makefile

diff --git a/projects/rlm_stg/Makefile b/projects/rlm_stg/Makefile
index 20530c5288567758285cffa29c41b0dd2e4344ff..3d4104838be58f4aa0a851281f2b08758a983648 100644 (file)
--- a/projects/rlm_stg/Makefile
+++ b/projects/rlm_stg/Makefile
@@ -8,29 +8,33 @@ LIB_NAME = rlm_stg
 
 PROG = $(LIB_NAME).so
 
 
 PROG = $(LIB_NAME).so
 

-SRCS = ./rlm_stg.cpp \
+SRCS = ./rlm_stg.c \
+       ./iface.cpp \

        ./stg_client.cpp
 
        ./stg_client.cpp
 

-STGLIBS = -lstg_common \
-          -lstg_crypto
+STGLIBS = crypto \
+         common
+          
+STGLIBS_INCS = $(addprefix -I ../../stglibs/,$(addsuffix .lib/include,$(STGLIBS)))
+STGLIBS_LIBS = $(addprefix -L ../../stglibs/,$(addsuffix .lib,$(STGLIBS)))

 
 

-LIBS += $(LIB_THREAD)
+LIBS += $(addprefix -lstg,$(STGLIBS)) $(LIB_THREAD)

 
 ifeq ($(OS),linux)
 LIBS += -ldl
 else
 LIBS += -lintl \
 
 ifeq ($(OS),linux)
 LIBS += -ldl
 else
 LIBS += -lintl \

-        -lc
+        -lc \
+       -liconv

 endif
 
 endif
 

-SEARCH_DIRS = -I $(DIR_INCLUDE)
+SEARCH_DIRS = -I ../../include

 
 OBJS = $(notdir $(patsubst %.cpp, %.o, $(patsubst %.c, %.o, $(SRCS))))
 
 
 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
 
 .PHONY: all clean distclean libs install uninstall install-bin uninstall-bin
 all: libs $(PROG) ../../Makefile.conf


@@ -38,8 +42,8 @@ all: libs $(PROG) ../../Makefile.conf
 libs:
        $(MAKE) -C $(DIR_LIBSRC)
 
 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
 
 clean:
        rm -f deps $(PROG) *.o tags *.*~ .OS


@@ -53,13 +57,30 @@ distclean: clean
 install: install-bin
 
 install-bin:
 install: install-bin
 
 install-bin:

-       install -m $(BIN_MODE) -o $(OWNER) -s $(PROG) $(PREFIX)/usr/lib/$(PROG)
+ifeq ($(DEBUG), yes)
+ifeq ($(OS), linux)
+       install -D -m $(BIN_MODE) -o $(OWNER) $(PROG) $(PREFIX)/usr/lib/freeradius/$(PROG)
+else
+       install -D -m $(BIN_MODE) -o $(OWNER) $(PROG) $(PREFIX)/usr/lib/$(PROG)
+endif
+else
+       install -D -m $(BIN_MODE) -o $(OWNER) -s $(PROG) $(PREFIX)/usr/lib/freeradius/$(PROG)
+ifeq ($(OS), linux)
+       install -D -m $(BIN_MODE) -o $(OWNER) -s $(PROG) $(PREFIX)/usr/lib/freeradius/$(PROG)
+else
+       install -D -m $(BIN_MODE) -o $(OWNER) -s $(PROG) $(PREFIX)/usr/lib/$(PROG)
+endif
+endif

        $(MAKE) -C $(DIR_LIBSRC) install
 
 uninstall: uninstall-bin
 
 uninstall-bin:
        $(MAKE) -C $(DIR_LIBSRC) install
 
 uninstall: uninstall-bin
 
 uninstall-bin:

+ifeq ($(OS), linux)
+       rm -f $(PREFIX)/usr/lib/freeradius/$(PROG)
+else

        rm -f $(PREFIX)/usr/lib/$(PROG)
        rm -f $(PREFIX)/usr/lib/$(PROG)

+endif

 
 ifneq ($(MAKECMDGOALS),distclean)
 ifneq ($(MAKECMDGOALS),clean)
 
 ifneq ($(MAKECMDGOALS),distclean)
 ifneq ($(MAKECMDGOALS),clean)


@@ -70,11 +91,16 @@ endif
 endif
 
 deps:  $(SRCS) ../../Makefile.conf
 endif
 
 deps:  $(SRCS) ../../Makefile.conf

-       $(MAKE) -C $(DIR_LIBSRC) includes
+       $(MAKE) -C $(DIR_LIBSRC)

        @>deps ;\
        for file in $(SRCS); do\
        @>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 "$$file" | grep ".c$$" > /dev/null;\
+         if [ $$? -eq 0 ];\
+         then\
+           echo "`$(CC) $(CFLAGS) -MM $$file` Makefile" >> deps ;\
+           printf '%b\n' '\t$$(CC) $(CFLAGS) -c $$<' >> deps ;\
+         else\
+           echo "`$(CXX) $(CXXFLAGS) -MM $$file` Makefile" >> deps ;\
+           printf '%b\n' '\t$$(CXX) $(CXXFLAGS) -c $$<' >> deps ;\
+         fi;\

        done
        done

-
-