Merge branch 'stg-2.409' into stg-2.409-radius

[stg.git] / projects / rlm_stg / Makefile

diff --git a/projects/rlm_stg/Makefile b/projects/rlm_stg/Makefile
index faa8aa307a921879a42fcf503e2e7b6911bc0715..27f486b410f443ac68bf6047b9868864bb7d1651 100644 (file)
--- a/projects/rlm_stg/Makefile
+++ b/projects/rlm_stg/Makefile
@@ -8,30 +8,35 @@ LIB_NAME = rlm_stg
 
 PROG = $(LIB_NAME).so
 
 
 PROG = $(LIB_NAME).so
 

-SRCS = ./rlm_stg.c \
-       ./iface.cpp \
-       ./stg_client.cpp
+SRCS = rlm_stg.c \
+       iface.cpp \
+       stg_client.cpp \
+       conn.cpp \
+       radlog.c

 
 STGLIBS = crypto \
 
 STGLIBS = crypto \

-         common
-          
+          common \
+          json
+

 STGLIBS_INCS = $(addprefix -I ../../stglibs/,$(addsuffix .lib/include,$(STGLIBS)))
 STGLIBS_LIBS = $(addprefix -L ../../stglibs/,$(addsuffix .lib,$(STGLIBS)))
 
 STGLIBS_INCS = $(addprefix -I ../../stglibs/,$(addsuffix .lib/include,$(STGLIBS)))
 STGLIBS_LIBS = $(addprefix -L ../../stglibs/,$(addsuffix .lib,$(STGLIBS)))
 

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

 
 ifeq ($(OS),linux)
 
 ifeq ($(OS),linux)

-LIBS += -ldl
+LIBS += -ldl \
+       -lyajl

 else
 LIBS += -lintl \
         -lc \
 else
 LIBS += -lintl \
         -lc \

-       -liconv
+       -lyajl

 endif
 
 SEARCH_DIRS = -I ../../include
 
 OBJS = $(notdir $(patsubst %.cpp, %.o, $(patsubst %.c, %.o, $(SRCS))))
 
 endif
 
 SEARCH_DIRS = -I ../../include
 
 OBJS = $(notdir $(patsubst %.cpp, %.o, $(patsubst %.c, %.o, $(SRCS))))
 

+CFLAGS += -fPIC $(DEFS) $(STGLIBS_INCS) $(SEARCH_DIRS)

 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)
 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)


@@ -58,16 +63,34 @@ install: install-bin
 
 install-bin:
 ifeq ($(DEBUG), yes)
 
 install-bin:
 ifeq ($(DEBUG), yes)

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

 else
 else

-       install -D -m $(BIN_MODE) -o $(OWNER) -s $(PROG) $(PREFIX)/usr/lib/$(PROG)
+       mkdir -m $(DIR_MODE) -p $(PREFIX)/usr/lib
+       install -m $(BIN_MODE) -o $(OWNER) -s $(PROG) $(PREFIX)/usr/lib/$(PROG)
+endif

 endif
        $(MAKE) -C $(DIR_LIBSRC) install
 
 uninstall: uninstall-bin
 
 uninstall-bin:
 endif
        $(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)