X-Git-Url: https://git.stg.codes/stg.git/blobdiff_plain/73ff333eec2793138265afd36f716a23e0f8bff6..519fd4f22bc83ba85a8377a7ada53fac4e2e2b39:/projects/rlm_stg/Makefile?ds=sidebyside

diff --git a/projects/rlm_stg/Makefile b/projects/rlm_stg/Makefile
index 3a4f5d7a..27f486b4 100644
--- a/projects/rlm_stg/Makefile
+++ b/projects/rlm_stg/Makefile
@@ -8,30 +8,35 @@ LIB_NAME = rlm_stg
 
 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 \
-	  common
-          
+          common \
+          json
+
 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)
-LIBS += -ldl
+LIBS += -ldl \
+	-lyajl
 else
 LIBS += -lintl \
         -lc \
-	-liconv
+	-lyajl
 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)
@@ -59,16 +64,21 @@ install: install-bin
 install-bin:
 ifeq ($(DEBUG), yes)
 ifeq ($(OS), linux)
-	install -D -m $(BIN_MODE) -o $(OWNER) $(PROG) $(PREFIX)/usr/lib/freeradius/$(PROG)
+	mkdir -m $(DIR_MODE) -p $(PREFIX)/usr/lib/freeradius
+	install -m $(BIN_MODE) -o $(OWNER) $(PROG) $(PREFIX)/usr/lib/freeradius/$(PROG)
 else
-	install -D -m $(BIN_MODE) -o $(OWNER) $(PROG) $(PREFIX)/usr/lib/$(PROG)
+	mkdir -m $(DIR_MODE) -p $(PREFIX)/usr/lib
+	install -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)
+	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)
-	install -D -m $(BIN_MODE) -o $(OWNER) -s $(PROG) $(PREFIX)/usr/lib/freeradius/$(PROG)
+	mkdir -m $(DIR_MODE) -p $(PREFIX)/usr/lib/freeradius
+	install -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)
+	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
@@ -76,7 +86,11 @@ endif
 uninstall: uninstall-bin
 
 uninstall-bin:
+ifeq ($(OS), linux)
 	rm -f $(PREFIX)/usr/lib/freeradius/$(PROG)
+else
+	rm -f $(PREFIX)/usr/lib/$(PROG)
+endif
 
 ifneq ($(MAKECMDGOALS),distclean)
 ifneq ($(MAKECMDGOALS),clean)