Cosmetic changes and possible sgconfig hang's fix

[stg.git] / projects / rlm_stg / Makefile

diff --git a/projects/rlm_stg/Makefile b/projects/rlm_stg/Makefile
index deaf437e0e85b128ccb2005ec170a4c4a8da882b..68cdb5be7cb2c887336e160efb69d5525d05c699 100644 (file)
--- a/projects/rlm_stg/Makefile
+++ b/projects/rlm_stg/Makefile
@@ -11,8 +11,8 @@ PROG = $(LIB_NAME).so
 SRCS = ./rlm_stg.cpp \
        ./stg_client.cpp
 
 SRCS = ./rlm_stg.cpp \
        ./stg_client.cpp
 

-STGLIBS = -lstg_common \
-          -lstg_crypto
+STGLIBS = -lstgcommon \
+          -lstgcrypto

 
 LIBS += $(LIB_THREAD)
 
 
 LIBS += $(LIB_THREAD)
 


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

-vpath %.so $(DIR_LIB)
+vpath %.a $(DIR_LIB)

 
 .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


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

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

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


@@ -53,14 +53,13 @@ distclean: clean
 install: install-bin
 
 install-bin:
 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:
        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)
 
 ifneq ($(MAKECMDGOALS),distclean)
 ifneq ($(MAKECMDGOALS),clean)