Fix projects and plugins building system to support new libs

diff --git a/projects/convertor/Makefile b/projects/convertor/Makefile
index 86ab6ed3dd1b305db53e7980e8d1179f5dfe70ce..7fd028807ab210d16a010c884d442063b51224a8 100644 (file)
--- a/projects/convertor/Makefile
+++ b/projects/convertor/Makefile
@@ -9,12 +9,16 @@ PROG = convertor
 SRCS = ./main.cpp \
        ./settings_impl.cpp
 
 SRCS = ./main.cpp \
        ./settings_impl.cpp
 

-STGLIBS =  -lstglogger \
-           -lstgcommon \
-           -ldotconfpp \
-          -lstgcrypto
+STGLIBS =  logger \
+           common \
+           dotconfpp \
+          crypto \
+          conffiles

 
 

-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
 
 ifeq ($(OS),linux)
 LIBS += -ldl


@@ -22,14 +26,13 @@ else
 LIBS += -lc
 endif
 
 LIBS += -lc
 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
-LDFLAGS += -Wl,-E -L$(DIR_LIB) -Wl,-rpath,$(DIR_LIB)
-
-vpath %.a $(DIR_LIB)
+CXXFLAGS += $(DEFS) $(STGLIBS_INCS) $(SEARCH_DIRS)
+CFLAGS += $(DEFS) $(STGLIBS_INCS) $(SEARCH_DIRS)
+LDFLAGS += -Wl,-E $(STGLIBS_LIBS)

 
 .PHONY: all clean distclean libs plugins install uninstall
 all: libs plugins $(PROG) ../../Makefile.conf
 
 .PHONY: all clean distclean libs plugins install uninstall
 all: libs plugins $(PROG) ../../Makefile.conf


@@ -40,7 +43,7 @@ libs:
 plugins: libs 
        $(MAKE) -C $(DIR_PLUGINS)
 
 plugins: libs 
        $(MAKE) -C $(DIR_PLUGINS)
 

-$(PROG): $(OBJS) $(STGLIBS) 
+$(PROG): $(OBJS)

        $(CXX) $^ $(LDFLAGS) $(LIBS) -o $(PROG)
 
 clean:
        $(CXX) $^ $(LDFLAGS) $(LIBS) -o $(PROG)
 
 clean:


@@ -64,11 +67,11 @@ 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 "`$(CC) $(CXXFLAGS) -MM $$file` Makefile" >> deps ;\
+         echo -e '\t$$(CC) -c $$< $(CXXFLAGS)' >> deps ;\

        done
 
 
        done
 
 

diff --git a/projects/rlm_stg/Makefile b/projects/rlm_stg/Makefile
index 68cdb5be7cb2c887336e160efb69d5525d05c699..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
 
 SRCS = ./rlm_stg.cpp \
        ./stg_client.cpp
 

-STGLIBS = -lstgcommon \
-          -lstgcrypto
+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
 
 ifeq ($(OS),linux)
 LIBS += -ldl


@@ -23,14 +26,13 @@ LIBS += -lintl \
         -lc
 endif
 
         -lc
 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 %.a $(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,7 +40,7 @@ all: libs $(PROG) ../../Makefile.conf
 libs:
        $(MAKE) -C $(DIR_LIBSRC)
 
 libs:
        $(MAKE) -C $(DIR_LIBSRC)
 

-$(PROG): $(OBJS) $(STGLIBS) 
+$(PROG): $(OBJS)

        $(CXX) $^ $(LDFLAGS) -o $(PROG) $(LIBS)
 
 clean:
        $(CXX) $^ $(LDFLAGS) -o $(PROG) $(LIBS)
 
 clean:


@@ -70,11 +72,11 @@ 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 "`$(CC) $(CXXFLAGS) -MM $$file` Makefile" >> deps ;\
+         echo -e '\t$$(CC) -c $$< $(CXXFLAGS)' >> deps ;\

        done
 
 
        done
 
 

diff --git a/projects/rscriptd/Makefile b/projects/rscriptd/Makefile
index a009a5c1d9359af5a6ff868f0f69fbc2935ae76b..2b7395a3d0e9d7615b48dda5c5b8c358f5fb9ed6 100644 (file)
--- a/projects/rscriptd/Makefile
+++ b/projects/rscriptd/Makefile
@@ -10,22 +10,25 @@ SRCS = ./main.cpp \
        ./listener.cpp \
        ./pidfile.cpp
 
        ./listener.cpp \
        ./pidfile.cpp
 

-STGLIBS =  -lstglogger \
-           -lstgcommon \
-          -lstgcrypto \
-           -lstgscriptexecuter \
-           -lstgconffiles
+STGLIBS =  logger \
+          locker \
+           common \
+          crypto \
+           scriptexecuter \
+           conffiles

 
 

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

 
 

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

 
 

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

 
 

-CXXFLAGS += -Wall
-LDFLAGS += -Wl,-E -L$(DIR_LIB) -Wl,-rpath,$(PREFIX)/usr/lib/stg -Wl,-rpath-link,$(DIR_LIB)
+OBJS = $(notdir $(patsubst %.cpp, %.o, $(patsubst %.c, %.o, $(SRCS))))

 
 

-vpath %.a $(DIR_LIB)
+CXXFLAGS += $(DEFS) $(STGLIBS_INCS) $(SEARCH_DIRS)
+CFLAGS += $(DEFS) $(STGLIBS_INCS) $(SEARCH_DIRS)
+LDFLAGS += -Wl,-E $(STGLIBS_LIBS)

 
 .PHONY: all clean distclean libs install uninstall
 all: libs $(PROG) ../../Makefile.conf
 
 .PHONY: all clean distclean libs install uninstall
 all: libs $(PROG) ../../Makefile.conf


@@ -33,7 +36,7 @@ all: libs $(PROG) ../../Makefile.conf
 libs:
        $(MAKE) -C $(DIR_LIBSRC)
 
 libs:
        $(MAKE) -C $(DIR_LIBSRC)
 

-$(PROG): $(OBJS) $(STGLIBS) 
+$(PROG): $(OBJS)

        $(CXX) $^ $(LDFLAGS) $(LIBS) -o $(PROG)
 
 clean:
        $(CXX) $^ $(LDFLAGS) $(LIBS) -o $(PROG)
 
 clean:


@@ -77,11 +80,11 @@ 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 "`$(CC) $(CXXFLAGS) -MM $$file` Makefile" >> deps ;\
+         echo -e '\t$$(CC) -c $$< $(CXXFLAGS)' >> deps ;\

        done
 
 
        done
 
 

diff --git a/projects/sgauth/Makefile b/projects/sgauth/Makefile
index cf2e2c5339bf7176b95287ed4adf7a5bd6cc1972..6e330c78f5725bc9b129aefef2be45ca3a5bea64 100644 (file)
--- a/projects/sgauth/Makefile
+++ b/projects/sgauth/Makefile
@@ -10,12 +10,15 @@ SRCS = ./main.cpp \
        ./settings_impl.cpp \
        ./web.cpp
 
        ./settings_impl.cpp \
        ./web.cpp
 

-STGLIBS =  -lstgconffiles \
-           -lstgia \
-           -lstgcrypto \
-           -lstgcommon
+STGLIBS =  conffiles \
+           ia \
+           crypto \
+           common

 
 

-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)
 else
 
 ifeq ($(OS),linux)
 else


@@ -23,14 +26,13 @@ LIBS += -lintl \
         -lc
 endif
 
         -lc
 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
-LDFLAGS += -Wl,-E -L$(DIR_LIB) -Wl,-rpath,$(PREFIX)/usr/lib/stg -Wl,-rpath-link,$(DIR_LIB)
-
-vpath %.a $(DIR_LIB)
+CXXFLAGS += $(DEFS) $(STGLIBS_INCS) $(SEARCH_DIRS)
+CFLAGS += $(DEFS) $(STGLIBS_INCS) $(SEARCH_DIRS)
+LDFLAGS += -Wl,-E $(STGLIBS_LIBS)

 
 .PHONY: all clean distclean libs install uninstall install-bin install-data uninstall-bin uninstall-data
 all: libs $(PROG) ../../Makefile.conf
 
 .PHONY: all clean distclean libs install uninstall install-bin install-data uninstall-bin uninstall-data
 all: libs $(PROG) ../../Makefile.conf


@@ -38,7 +40,7 @@ all: libs $(PROG) ../../Makefile.conf
 libs:
        $(MAKE) -C $(DIR_LIBSRC)
 
 libs:
        $(MAKE) -C $(DIR_LIBSRC)
 

-$(PROG): $(OBJS) $(STGLIBS) 
+$(PROG): $(OBJS)

        $(CXX) $^ $(LDFLAGS) -o $(PROG) $(LIBS)
 
 clean:
        $(CXX) $^ $(LDFLAGS) -o $(PROG) $(LIBS)
 
 clean:


@@ -83,10 +85,10 @@ endif
 endif
 
 deps:  $(SRCS) ../../Makefile.conf sgauth.css
 endif
 
 deps:  $(SRCS) ../../Makefile.conf sgauth.css

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

        @>deps ;\
        ./make_css.sh
        for file in $(SRCS); do\
        @>deps ;\
        ./make_css.sh
        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
        done

diff --git a/projects/sgauthstress/Makefile b/projects/sgauthstress/Makefile
index 4864da31caa597a227369447d5490d2a0d4d8b74..9d5e94cde1618a8f87136b732b2b9c991b5500ab 100644 (file)
--- a/projects/sgauthstress/Makefile
+++ b/projects/sgauthstress/Makefile
@@ -8,11 +8,15 @@ SRCS = main.cpp \
        user.cpp \
        proto.cpp
 
        user.cpp \
        proto.cpp
 

-STGLIBS =  -lstgcrypto \
-           -lstgcommon \
-           -ldotconfpp
+STGLIBS = crypto \
+          common \
+          dotconfpp \
+         locker

 
 

-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
 
 ifeq ($(OS),linux)
 LIBS += -ldl


@@ -21,14 +25,13 @@ LIBS += -lintl \
         -lc
 endif
 
         -lc
 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
-LDFLAGS += -Wl,-E -L$(DIR_LIB) -Wl,-rpath,$(PREFIX)/usr/lib/stg -Wl,-rpath-link,$(DIR_LIB)
-
-vpath %.a $(DIR_LIB)
+CXXFLAGS += $(DEFS) $(STGLIBS_INCS) $(SEARCH_DIRS)
+CFLAGS += $(DEFS) $(STGLIBS_INCS) $(SEARCH_DIRS)
+LDFLAGS += -Wl,-E $(STGLIBS_LIBS)

 
 .PHONY: all clean distclean libs plugins
 all: libs plugins $(PROG) ../../Makefile.conf
 
 .PHONY: all clean distclean libs plugins
 all: libs plugins $(PROG) ../../Makefile.conf


@@ -39,8 +42,8 @@ libs:
 plugins: libs 
        $(MAKE) -C $(DIR_PLUGINS)
 
 plugins: libs 
        $(MAKE) -C $(DIR_PLUGINS)
 

-$(PROG): $(OBJS) libs
-       $(CXX) $(OBJS) $(LDFLAGS) $(LIBS) $(STGLIBS) -o $(PROG)
+$(PROG): $(OBJS)
+       $(CXX) $^ $(LDFLAGS) $(LIBS) -o $(PROG)

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


@@ -59,9 +62,9 @@ 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 ../../Makefile.conf" >> deps ;\
-         echo -e '\t$$(CC) -c $$< $(CXXFLAGS) $(SEARCH_DIRS) $(DEFS)' >> deps ;\
+         echo "`$(CC) $(CXXFLAGS) -MM $$file` Makefile ../../Makefile.conf" >> deps ;\
+         echo -e '\t$$(CC) -c $$< $(CXXFLAGS)' >> deps ;\

        done
        done

diff --git a/projects/sgconf/Makefile b/projects/sgconf/Makefile
index 02f8d7b80bbe4b6e81ce13c5ced1e09a02088ec1..6dbf21171f5569a63d0b066cf11d834309030739 100644 (file)
--- a/projects/sgconf/Makefile
+++ b/projects/sgconf/Makefile
@@ -9,22 +9,23 @@ PROG = sgconf
 SRCS = ./main.cpp \
        ./common_sg.cpp
 
 SRCS = ./main.cpp \
        ./common_sg.cpp
 

-STGLIBS =  -lstgconffiles \
-           -lstgsrvconf \
-           -lstgcommon \
-          -lstgcrypto
+STGLIBS = conffiles \
+          srvconf \
+          common \
+         crypto

 
 

-LIBS += -lexpat \
-       $(LIB_THREAD)
+STGLIBS_INCS = $(addprefix -I ../../stglibs/,$(addsuffix .lib/include,$(STGLIBS)))
+STGLIBS_LIBS = $(addprefix -L ../../stglibs/,$(addsuffix .lib,$(STGLIBS)))
+
+LIBS += -lexpat $(LIB_THREAD) $(addprefix -lstg,$(STGLIBS))

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

-LIBS += -ldl

 else
 LIBS += -lc \
        -liconv
 endif
 
 else
 LIBS += -lc \
        -liconv
 endif
 

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

 
 ifeq ($(OS),bsd)
 SEARCH_DIRS += -I/usr/local/include
 
 ifeq ($(OS),bsd)
 SEARCH_DIRS += -I/usr/local/include


@@ -38,10 +39,9 @@ endif
 
 OBJS = $(notdir $(patsubst %.cpp, %.o, $(patsubst %.c, %.o, $(SRCS))))
 
 
 OBJS = $(notdir $(patsubst %.cpp, %.o, $(patsubst %.c, %.o, $(SRCS))))
 

-CXXFLAGS += -Wall
-LDFLAGS += -Wl,-E -L$(DIR_LIB) -Wl,-rpath,$(PREFIX)/usr/lib/stg -Wl,-rpath-link,$(DIR_LIB)
-
-vpath %.a $(DIR_LIB)
+CXXFLAGS += $(DEFS) $(STGLIBS_INCS) $(SEARCH_DIRS)
+CFLAGS += $(DEFS) $(STGLIBS_INCS) $(SEARCH_DIRS)
+LDFLAGS += -Wl,-E $(STGLIBS_LIBS)

 
 .PHONY: all clean distclean libs install uninstall install-bin install-data uninstall-bin uninstall-data
 all: libs $(PROG) ../../Makefile.conf
 
 .PHONY: all clean distclean libs install uninstall install-bin install-data uninstall-bin uninstall-data
 all: libs $(PROG) ../../Makefile.conf


@@ -49,7 +49,7 @@ all: libs $(PROG) ../../Makefile.conf
 libs:
        $(MAKE) -C $(DIR_LIBSRC)
 
 libs:
        $(MAKE) -C $(DIR_LIBSRC)
 

-$(PROG): $(OBJS) $(STGLIBS)
+$(PROG): $(OBJS)

        $(CXX) $^ $(LDFLAGS) $(LIBS) -o $(PROG)
 
 clean:
        $(CXX) $^ $(LDFLAGS) $(LIBS) -o $(PROG)
 
 clean:


@@ -84,11 +84,11 @@ 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 "`$(CC) $(CXXFLAGS) -MM $$file` Makefile" >> deps ;\
+         echo -e '\t$$(CC) -c $$< $(CXXFLAGS)' >> deps ;\

        done
 
 
        done
 
 

diff --git a/projects/sgconf_xml/Makefile b/projects/sgconf_xml/Makefile
index 2453ef5c971dff322306f9ad924b951d706d14b6..671833eda2a1b3d53aedc71c1136c6e82b5671d3 100644 (file)
--- a/projects/sgconf_xml/Makefile
+++ b/projects/sgconf_xml/Makefile
@@ -9,22 +9,23 @@ PROG = sgconf_xml
 SRCS = ./main.cpp \
        ./parser.cpp
 
 SRCS = ./main.cpp \
        ./parser.cpp
 

-LIBS =  -lstgconffiles \
-        -lstgsrvconf \
-        -lstgcrypto \
-        -lstgcommon
+STGLIBS = conffiles \
+          srvconf \
+          crypto \
+          common

 
 

-LIBS += -lexpat \
-       $(LIB_THREAD)
+STGLIBS_INCS = $(addprefix -I ../../stglibs/,$(addsuffix .lib/include,$(STGLIBS)))
+STGLIBS_LIBS = $(addprefix -L ../../stglibs/,$(addsuffix .lib,$(STGLIBS)))
+
+LIBS += -lexpat $(LIB_THREAD) $(addprefix -lstg,$(STGLIBS))

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

-LIBS += -ldl

 else
 LIBS += -lc \
        -liconv
 endif
 
 else
 LIBS += -lc \
        -liconv
 endif
 

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

 
 ifeq ($(OS),bsd)
 SEARCH_DIRS += -I/usr/local/include
 
 ifeq ($(OS),bsd)
 SEARCH_DIRS += -I/usr/local/include


@@ -38,10 +39,9 @@ endif
 
 OBJS = $(notdir $(patsubst %.cpp, %.o, $(patsubst %.c, %.o, $(SRCS))))
 
 
 OBJS = $(notdir $(patsubst %.cpp, %.o, $(patsubst %.c, %.o, $(SRCS))))
 

-CXXFLAGS += -Wall
-LDFLAGS += -Wl,-E -L$(DIR_LIB) -Wl,-rpath,$(PREFIX)/usr/lib/stg -Wl,-rpath-link,$(DIR_LIB)
-
-vpath %.a $(DIR_LIB)
+CXXFLAGS += $(DEFS) $(STGLIBS_INCS) $(SEARCH_DIRS)
+CFLAGS += $(DEFS) $(STGLIBS_INCS) $(SEARCH_DIRS)
+LDFLAGS += -Wl,-E $(STGLIBS_LIBS)

 
 .PHONY: all clean distclean libs install uninstall install-bin install-data uninstall-bin uninstall-data
 all: libs $(PROG) ../../Makefile.conf
 
 .PHONY: all clean distclean libs install uninstall install-bin install-data uninstall-bin uninstall-data
 all: libs $(PROG) ../../Makefile.conf


@@ -49,7 +49,7 @@ all: libs $(PROG) ../../Makefile.conf
 libs:
        $(MAKE) -C $(DIR_LIBSRC)
 
 libs:
        $(MAKE) -C $(DIR_LIBSRC)
 

-$(PROG): $(OBJS) $(STGLIBS)
+$(PROG): $(OBJS)

        $(CXX) $^ $(LIBS) $(LDFLAGS) -o $(PROG)
 
 clean:
        $(CXX) $^ $(LIBS) $(LDFLAGS) -o $(PROG)
 
 clean:


@@ -84,11 +84,11 @@ 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 "`$(CC) $(CXXFLAGS) -MM $$file` Makefile" >> deps ;\
+         echo -e '\t$$(CC) -c $$< $(CXXFLAGS)' >> deps ;\

        done
 
 
        done
 
 

diff --git a/projects/stargazer/Makefile b/projects/stargazer/Makefile
index 56702d0711b3ee114d1fcc1fede08ccb368aa70f..020e05b54f54d8181281ecd9759252c02413f9aa 100644 (file)
--- a/projects/stargazer/Makefile
+++ b/projects/stargazer/Makefile
@@ -24,28 +24,30 @@ SRCS = ./admin_impl.cpp \
        ./user_property.cpp \
        ./users_impl.cpp
 
        ./user_property.cpp \
        ./users_impl.cpp
 

-STGLIBS =  -lstglogger \
-          -lstglocker \
-           -lstgcommon \
-           -lstgscriptexecuter \
-           -ldotconfpp
+STGLIBS = logger \
+         locker \
+          common \
+          scriptexecuter \
+          dotconfpp

 
 

-LIBS += -lexpat
+STGLIBS_INCS = $(addprefix -I ../../stglibs/,$(addsuffix .lib/include,$(STGLIBS)))
+STGLIBS_LIBS = $(addprefix -L ../../stglibs/,$(addsuffix .lib,$(STGLIBS)))
+
+LIBS += -lexpat $(LIB_THREAD) $(addprefix -lstg,$(STGLIBS))

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

-LIBS += $(LIB_THREAD) \
-        -ldl
+LIBS += -ldl

 else
 else

-LIBS += $(LIB_THREAD) \
-        -lc
+LIBS += -lc

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

-LDFLAGS += -Wl,-E -L$(DIR_LIB) -Wl,-rpath,$(PREFIX)/usr/lib/stg -Wl,-rpath-link,$(DIR_LIB) 
-vpath %.so $(DIR_LIB)
+CXXFLAGS += $(DEFS) $(STGLIBS_INCS) $(SEARCH_DIRS)
+CFLAGS += $(DEFS) $(STGLIBS_INCS) $(SEARCH_DIRS)
+LDFLAGS += -Wl,-E $(STGLIBS_LIBS)

 
 .PHONY: all clean distclean libs plugins install uninstall install-bin install-data
 all: libs plugins $(PROG)
 
 .PHONY: all clean distclean libs plugins install uninstall install-bin install-data
 all: libs plugins $(PROG)


@@ -56,8 +58,8 @@ libs:
 plugins: libs 
        $(MAKE) -C $(DIR_PLUGINS)
 
 plugins: libs 
        $(MAKE) -C $(DIR_PLUGINS)
 

-$(PROG): $(OBJS) libs
-       $(CXX) $(OBJS) $(LDFLAGS) $(LIBS) $(STGLIBS) -o $(PROG)
+$(PROG): $(OBJS)
+       $(CXX) $^ $(LDFLAGS) $(LIBS) -o $(PROG)

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


@@ -146,9 +148,9 @@ 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 ../../Makefile.conf" >> deps ;\
-         echo -e '\t$$(CC) -c $$< $(CXXFLAGS) $(SEARCH_DIRS) $(DEFS)' >> deps ;\
+         echo "`$(CC) $(CXXFLAGS) -MM $$file` Makefile ../../Makefile.conf" >> deps ;\
+         echo -e '\t$$(CC) -c $$< $(CXXFLAGS)' >> deps ;\

        done
        done

diff --git a/projects/stargazer/plugins/Makefile.in b/projects/stargazer/plugins/Makefile.in
index 961ba3aaf6ff253fec19dcca6bd28b4c84dae160..1389d9ef3516a20c1dbcd3c81d242dde47fc465b 100644 (file)
--- a/projects/stargazer/plugins/Makefile.in
+++ b/projects/stargazer/plugins/Makefile.in
@@ -8,15 +8,18 @@ OBJS = $(notdir $(patsubst %.cpp, %.o, $(patsubst %.c, %.o, $(SRCS))))
 
 LN = ln
 
 
 LN = ln
 

-CXXFLAGS += -fPIC
-CFLAGS += -fPIC
-LDFLAGS += -shared -L$(DIR_LIB) -Wl,-rpath,$(PREFIX)/usr/lib/stg
+STGLIBS_INCS = $(addprefix -I ../../../../../stglibs/,$(addsuffix .lib/include,$(STGLIBS)))
+STGLIBS_LIBS = $(addprefix -L ../../../../../stglibs/,$(addsuffix .lib,$(STGLIBS)))

 
 

-vpath %.a $(DIR_LIB)
+LIBS += $(addprefix -lstg,$(STGLIBS))
+
+CXXFLAGS += -fPIC $(STGLIBS_INCS)
+CFLAGS += -fPIC $(STGLIBS_INCS)
+LDFLAGS += -shared -Wl,-rpath,$(PREFIX)/usr/lib/stg $(STGLIBS_LIBS)

 
 all: $(PROG)
 
 
 all: $(PROG)
 

-$(PROG): $(OBJS) $(STGLIBS)
+$(PROG): $(OBJS)

        $(CXX) $^ $(LDFLAGS) $(LIBS) -o $(PROG)
        $(LN) -fs "`pwd`/$(PROG)" $(DIR_MOD)/$(PROG)
 
        $(CXX) $^ $(LDFLAGS) $(LIBS) -o $(PROG)
        $(LN) -fs "`pwd`/$(PROG)" $(DIR_MOD)/$(PROG)
 

diff --git a/projects/stargazer/plugins/authorization/ao/Makefile b/projects/stargazer/plugins/authorization/ao/Makefile
index a8651d64a10f2059a8f7233d3ac4d01e1377762c..1a7697e36972a0f6b6169306d2b6c990b71c0cc5 100644 (file)
--- a/projects/stargazer/plugins/authorization/ao/Makefile
+++ b/projects/stargazer/plugins/authorization/ao/Makefile
@@ -8,7 +8,10 @@ PROG = mod_auth_ao.so
 
 SRCS = ./ao.cpp
 
 
 SRCS = ./ao.cpp
 

-STGLIBS = -lstgcommon
+STGLIBS = common \
+         logger \
+         locker \
+         scriptexecuter

 
 include ../../Makefile.in
 
 
 include ../../Makefile.in
 

diff --git a/projects/stargazer/plugins/authorization/inetaccess/Makefile b/projects/stargazer/plugins/authorization/inetaccess/Makefile
index 15fd52878c6c75884835a7e13ff84d0f047c3de5..6f735ad8721a828e609c156a9cda07ca398a5f64 100644 (file)
--- a/projects/stargazer/plugins/authorization/inetaccess/Makefile
+++ b/projects/stargazer/plugins/authorization/inetaccess/Makefile
@@ -10,7 +10,11 @@ PROG = mod_auth_ia.so
 
 SRCS = ./inetaccess.cpp
 
 
 SRCS = ./inetaccess.cpp
 

-STGLIBS = -lstgcommon -lstgcrypto
+STGLIBS = common \
+         crypto \
+         logger \
+         locker \
+         scriptexecuter

 
 include ../../Makefile.in
 
 
 include ../../Makefile.in
 

diff --git a/projects/stargazer/plugins/authorization/stress/Makefile b/projects/stargazer/plugins/authorization/stress/Makefile
index 2bdcf1b05a9ac74685fad0ddaf9cdbf43036e875..411acfaff2655302aaec096a260764e046593089 100644 (file)
--- a/projects/stargazer/plugins/authorization/stress/Makefile
+++ b/projects/stargazer/plugins/authorization/stress/Makefile
@@ -10,5 +10,10 @@ SRCS = ./stress.cpp
 
 LIBS += $(LIB_THREAD)
 
 
 LIBS += $(LIB_THREAD)
 

+STGLIBS = common \
+         logger \
+         locker \
+         scriptexecuter
+

 include ../../Makefile.in
 
 include ../../Makefile.in
 

diff --git a/projects/stargazer/plugins/capture/cap_debug/Makefile b/projects/stargazer/plugins/capture/cap_debug/Makefile
index 916ae175591691ce6e5f95b6169b97511aeeda72..48b0e8701daf8fdb0c8c7e2bc2a4e760c69f24ee 100644 (file)
--- a/projects/stargazer/plugins/capture/cap_debug/Makefile
+++ b/projects/stargazer/plugins/capture/cap_debug/Makefile
@@ -16,7 +16,7 @@ SRCS = ./debug_cap.cpp \
        ./tcp.c \
        ./udp.c
 
        ./tcp.c \
        ./udp.c
 

-STGLIBS = -lstgcommon
+STGLIBS = common

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

diff --git a/projects/stargazer/plugins/capture/cap_nf/Makefile b/projects/stargazer/plugins/capture/cap_nf/Makefile
index b0f7713d8a68ee6b69a2f2e217d1fa1bf8166898..481862dd23db24a6199c8edad24bf685cb8f256e 100644 (file)
--- a/projects/stargazer/plugins/capture/cap_nf/Makefile
+++ b/projects/stargazer/plugins/capture/cap_nf/Makefile
@@ -9,7 +9,8 @@ PROG = mod_cap_nf.so
 SRCS = ./cap_nf.cpp
 
 LIBS += $(LIB_THREAD)
 SRCS = ./cap_nf.cpp
 
 LIBS += $(LIB_THREAD)

-STGLIBS = -lstgcommon
+
+STGLIBS = common

 
 include ../../Makefile.in
 
 
 include ../../Makefile.in
 

diff --git a/projects/stargazer/plugins/capture/divert_freebsd/Makefile b/projects/stargazer/plugins/capture/divert_freebsd/Makefile
index 2fbc97d62a1d509ab507b295d0bdefa4bb66f58d..48e24826c8132415d005fceadfbd569d5c60eff3 100644 (file)
--- a/projects/stargazer/plugins/capture/divert_freebsd/Makefile
+++ b/projects/stargazer/plugins/capture/divert_freebsd/Makefile
@@ -8,9 +8,9 @@ PROG = mod_cap_divert.so
 
 SRCS = ./divert_cap.cpp 
 
 
 SRCS = ./divert_cap.cpp 
 

-STGLIBS = -lstgcommon
-

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

+STGLIBS = common
+

 include ../../Makefile.in
 
 include ../../Makefile.in
 

diff --git a/projects/stargazer/plugins/capture/ether_freebsd/Makefile b/projects/stargazer/plugins/capture/ether_freebsd/Makefile
index f4b86e211e0f71156145c4c3bdb9f6dff77b3b6c..d108789680c85a17e274c0943d0d79ba9c1541bf 100644 (file)
--- a/projects/stargazer/plugins/capture/ether_freebsd/Makefile
+++ b/projects/stargazer/plugins/capture/ether_freebsd/Makefile
@@ -8,9 +8,9 @@ PROG = mod_cap_bpf.so
 
 SRCS = ./ether_cap.cpp 
 
 
 SRCS = ./ether_cap.cpp 
 

-STGLIBS = -lstgcommon
-

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

+STGLIBS = common
+

 include ../../Makefile.in
 
 include ../../Makefile.in
 

diff --git a/projects/stargazer/plugins/capture/ether_linux/Makefile b/projects/stargazer/plugins/capture/ether_linux/Makefile
index a045167c10c9e105f6042758adb9f7125f3c3b10..873ba6f06d9869d3d5741ecc0750bfeafa06990a 100644 (file)
--- a/projects/stargazer/plugins/capture/ether_linux/Makefile
+++ b/projects/stargazer/plugins/capture/ether_linux/Makefile
@@ -9,7 +9,8 @@ PROG = mod_cap_ether.so
 SRCS = ./ether_cap.cpp
 
 LIBS += $(LIB_THREAD)
 SRCS = ./ether_cap.cpp
 
 LIBS += $(LIB_THREAD)

-STGLIBS = -lstgcommon
+
+STGLIBS = common

 
 include ../../Makefile.in
 
 
 include ../../Makefile.in
 

diff --git a/projects/stargazer/plugins/capture/ipq_linux/Makefile b/projects/stargazer/plugins/capture/ipq_linux/Makefile
index 988cd9485107a88e12b1a7895d287984bc549b0e..548f589c62825de49af45c5fe054ddfa11815ffc 100644 (file)
--- a/projects/stargazer/plugins/capture/ipq_linux/Makefile
+++ b/projects/stargazer/plugins/capture/ipq_linux/Makefile
@@ -10,7 +10,8 @@ SRCS = ./ipq_cap.cpp \
        ./libipq.c
 
 LIBS += $(LIB_THREAD)
        ./libipq.c
 
 LIBS += $(LIB_THREAD)

-STGLIBS = -lstgcommon
+
+STGLIBS = common

 
 include ../../Makefile.in
 
 
 include ../../Makefile.in
 

diff --git a/projects/stargazer/plugins/configuration/rpcconfig/Makefile b/projects/stargazer/plugins/configuration/rpcconfig/Makefile
index e0e090521fe206422834957a51f22d6efad30a9c..b2bdabf6418fa8808cf8777356b2c161041cf469 100644 (file)
--- a/projects/stargazer/plugins/configuration/rpcconfig/Makefile
+++ b/projects/stargazer/plugins/configuration/rpcconfig/Makefile
@@ -24,7 +24,10 @@ ifneq ($(OS),linux)
 LIBS += -liconv
 endif
 
 LIBS += -liconv
 endif
 

-STGLIBS = -lstgcommon -lstglogger
+STGLIBS = common \
+         locker \
+         logger \
+         scriptexecuter

 
 include ../../Makefile.in
 
 
 include ../../Makefile.in
 

diff --git a/projects/stargazer/plugins/configuration/sgconfig-ng/Makefile b/projects/stargazer/plugins/configuration/sgconfig-ng/Makefile
index 6d1a7a7bb99d5a0f1af9db4f03587af0cbe99d21..8f10023307b37c1143cb9117f6ab6b05b21a495b 100644 (file)
--- a/projects/stargazer/plugins/configuration/sgconfig-ng/Makefile
+++ b/projects/stargazer/plugins/configuration/sgconfig-ng/Makefile
@@ -18,6 +18,8 @@ SRCS = ./stgconfig.cpp \
 LIBS += -lexpat \
        -lboost_thread-mt
 
 LIBS += -lexpat \
        -lboost_thread-mt
 

-STGLIBS = -lstgcommon -lstglogger -lcrypto
+STGLIBS = common \
+         logger \
+         crypto

 
 include ../../Makefile.in
 
 include ../../Makefile.in

diff --git a/projects/stargazer/plugins/configuration/sgconfig/Makefile b/projects/stargazer/plugins/configuration/sgconfig/Makefile
index f49ed0189bbed5bfae25b950c5a3b267f3d055ef..b6f4938a632095cfcdf505f4fb950e39d65845e6 100644 (file)
--- a/projects/stargazer/plugins/configuration/sgconfig/Makefile
+++ b/projects/stargazer/plugins/configuration/sgconfig/Makefile
@@ -16,7 +16,11 @@ SRCS = ./stgconfig.cpp \
 LIBS += -lexpat \
        $(LIB_THREAD)
 
 LIBS += -lexpat \
        $(LIB_THREAD)
 

-STGLIBS = -lstgcommon -lstglogger -lstgcrypto
+STGLIBS = common \
+         locker \
+         logger \
+         crypto \
+         scriptexecuter

 
 include ../../Makefile.in
 
 
 include ../../Makefile.in
 

diff --git a/projects/stargazer/plugins/configuration/sgconfig2/Makefile b/projects/stargazer/plugins/configuration/sgconfig2/Makefile
index 290a616bfb09ea79e6dad536465ea7194a6f32d2..68bf7f740b6f3aec3ce6caf2fc92239417ef1743 100644 (file)
--- a/projects/stargazer/plugins/configuration/sgconfig2/Makefile
+++ b/projects/stargazer/plugins/configuration/sgconfig2/Makefile
@@ -16,7 +16,8 @@ SRCS = ./stgconfig.cpp \
 LIBS += -lexpat \
        $(LIB_THREAD)
 
 LIBS += -lexpat \
        $(LIB_THREAD)
 

-STGLIBS = -lstgcommon -lstglogger
+STGLIBS = common \
+         logger

 
 include ../../Makefile.in
 
 
 include ../../Makefile.in
 

diff --git a/projects/stargazer/plugins/other/ping/Makefile b/projects/stargazer/plugins/other/ping/Makefile
index 212bd2889b1d7132c0861b16531908e38cf17dc9..931c3f4a7512b93f7b04ab55f895e4eb7fb58f97 100644 (file)
--- a/projects/stargazer/plugins/other/ping/Makefile
+++ b/projects/stargazer/plugins/other/ping/Makefile
@@ -10,7 +10,11 @@ PROG = mod_ping.so
 
 SRCS = ./ping.cpp
 
 
 SRCS = ./ping.cpp
 

-STGLIBS = -lstgpinger -lstgcommon
+STGLIBS = pinger \
+         common \
+         locker \
+         logger \
+         scriptexecuter

 
 include ../../Makefile.in
 
 
 include ../../Makefile.in
 

diff --git a/projects/stargazer/plugins/other/radius/Makefile b/projects/stargazer/plugins/other/radius/Makefile
index 9735fb67d9d52493b2e20e2bdfe3e5efde9c7b87..06f467ba2f199ae4b891423639c560ffe986288c 100644 (file)
--- a/projects/stargazer/plugins/other/radius/Makefile
+++ b/projects/stargazer/plugins/other/radius/Makefile
@@ -10,7 +10,11 @@ PROG = mod_radius.so
 
 SRCS = ./radius.cpp
 
 
 SRCS = ./radius.cpp
 

-STGLIBS = -lstgcommon -lstgcrypto
+STGLIBS = common \
+         crypto \
+         logger \
+         locker \
+         scriptexecuter

 
 include ../../Makefile.in
 
 
 include ../../Makefile.in
 

diff --git a/projects/stargazer/plugins/other/rscript/Makefile b/projects/stargazer/plugins/other/rscript/Makefile
index 343d1150db8dbf106bebf17b1cdd9ee4229e7a5b..f9ba3ba19aa09f9ce638a102f8e60a34368a729e 100644 (file)
--- a/projects/stargazer/plugins/other/rscript/Makefile
+++ b/projects/stargazer/plugins/other/rscript/Makefile
@@ -11,7 +11,11 @@ PROG = mod_remote_script.so
 SRCS = ./rscript.cpp \
        ./nrmap_parser.cpp
 
 SRCS = ./rscript.cpp \
        ./nrmap_parser.cpp
 

-STGLIBS = -lstgcommon -lstgcrypto
+STGLIBS = common \
+         crypto \
+         locker \
+         logger \
+         scriptexecuter

 
 include ../../Makefile.in
 
 
 include ../../Makefile.in
 

diff --git a/projects/stargazer/plugins/other/smux/Makefile b/projects/stargazer/plugins/other/smux/Makefile
index feaef9ee1d0772228810b62f6df685440faee2e6..1c875dcd70bf3002d39b68ce82794c35f381ab05 100644 (file)
--- a/projects/stargazer/plugins/other/smux/Makefile
+++ b/projects/stargazer/plugins/other/smux/Makefile
@@ -11,13 +11,13 @@ SRCS =  smux.cpp \
        utils.cpp \
        types.cpp
 
        utils.cpp \
        types.cpp
 

-STGLIBS = -lstgcommon -lstgsmux
+STGLIBS = common \
+         smux \
+         logger \
+         locker \
+         scriptexecuter

 
 

-CXXFLAGS += -I$(DIR_INCLUDE)/stg
+CFLAGS += -I ../../../../../stglibs/smux.lib/include/stg
+CXXFLAGS += -I ../../../../../stglibs/smux.lib/include/stg

 
 include ../../Makefile.in
 
 include ../../Makefile.in

-
-.PHONY: asn1
-
-asn1:
-       $(MAKE) -C asn1 asn1

diff --git a/projects/stargazer/plugins/store/files/Makefile b/projects/stargazer/plugins/store/files/Makefile
index 8bf5777a39fa1f7a095efa7f0bd3fbfc4e45df75..372a3cd44af4f1a7a2456c4e4c1233b5edc49ce7 100644 (file)
--- a/projects/stargazer/plugins/store/files/Makefile
+++ b/projects/stargazer/plugins/store/files/Makefile
@@ -8,7 +8,11 @@ PROG = mod_store_files.so
 
 SRCS = ./file_store.cpp
 
 
 SRCS = ./file_store.cpp
 

-STGLIBS = -lstgconffiles -lstgcommon -lstglocker -lstgcrypto
+STGLIBS = conffiles \
+         common \
+         locker \
+         logger \
+         crypto

 
 include ../../Makefile.in
 
 
 include ../../Makefile.in
 

diff --git a/projects/stargazer/plugins/store/firebird/Makefile b/projects/stargazer/plugins/store/firebird/Makefile
index 8b175fd99e32de2f263bea242710778bf811108b..b4cce929949d7e5b0a78af6fcef9690984f58158 100644 (file)
--- a/projects/stargazer/plugins/store/firebird/Makefile
+++ b/projects/stargazer/plugins/store/firebird/Makefile
@@ -17,7 +17,10 @@ SRCS =       ./firebird_store.cpp \
        ./firebird_store_users.cpp \
        ./firebird_store_utils.cpp
 
        ./firebird_store_users.cpp \
        ./firebird_store_utils.cpp
 

-STGLIBS = -libpp -lstgcommon -lstglocker -lstgcrypto
+STGLIBS = ibpp \
+         common \
+         locker \
+         crypto

 
 include ../../Makefile.in
 
 
 include ../../Makefile.in
 

diff --git a/projects/stargazer/plugins/store/mysql/Makefile b/projects/stargazer/plugins/store/mysql/Makefile
index 81196222db5bbff9beec8c32b19e276d4f6e1535..57c52a6b0b94cf9eb829e29fa3aac0a5a5662cdf 100644 (file)
--- a/projects/stargazer/plugins/store/mysql/Makefile
+++ b/projects/stargazer/plugins/store/mysql/Makefile
@@ -8,7 +8,8 @@ PROG = mod_store_mysql.so
 
 SRCS = ./mysql_store.cpp
 
 
 SRCS = ./mysql_store.cpp
 

-STGLIBS = -lstgcommon -lstgcrypto
+STGLIBS = common \
+         crypto

 
 MYSQL_CFLAGS = $(shell mysql_config --cflags)
 MYSQL_LDFLAGS = $(shell mysql_config --libs_r)
 
 MYSQL_CFLAGS = $(shell mysql_config --cflags)
 MYSQL_LDFLAGS = $(shell mysql_config --libs_r)

diff --git a/projects/stargazer/plugins/store/postgresql/Makefile b/projects/stargazer/plugins/store/postgresql/Makefile
index fa6ebf0d38a1d89990223ffaa04f2bb3d25f7363..b59e45cd19e550ec8c74f46bbb7d15cc57e07380 100644 (file)
--- a/projects/stargazer/plugins/store/postgresql/Makefile
+++ b/projects/stargazer/plugins/store/postgresql/Makefile
@@ -15,7 +15,9 @@ SRCS =        ./postgresql_store.cpp \
        ./postgresql_store_users.cpp \
        ./postgresql_store_utils.cpp
 
        ./postgresql_store_users.cpp \
        ./postgresql_store_utils.cpp
 

-STGLIBS = -lstgcommon -lstgcrypto
+STGLIBS = common \
+         crypto \
+         locker

 
 PG_CFLAGS = $(shell pg_config --includedir)
 PG_LDFLAGS = $(shell pg_config --libdir)
 
 PG_CFLAGS = $(shell pg_config --includedir)
 PG_LDFLAGS = $(shell pg_config --libdir)

diff --git a/stglibs/Makefile b/stglibs/Makefile
index f7d5e45e1447863ca173f738be3dd11fb4ceeddd..912be63debeb836291c7b4b6fe34904288502d56 100644 (file)
--- a/stglibs/Makefile
+++ b/stglibs/Makefile
@@ -14,9 +14,7 @@ $(STG_LIBS):
 includes: all
 
 clean: all
 includes: all
 
 clean: all

-       rm -f $(DIR_LIB)/*

 
 install: all
 
 uninstall: all
 
 install: all
 
 uninstall: all

-

diff --git a/stglibs/Makefile.in b/stglibs/Makefile.in
index c0b4f2b95bee88f490fc99e334f5e56483d92fb1..5bbc24e5bdfe2bf8d710dd06a0b862ab2841ce71 100644 (file)
--- a/stglibs/Makefile.in
+++ b/stglibs/Makefile.in
@@ -6,7 +6,7 @@ include ../../Makefile.conf
 
 PROG = lib$(LIB_NAME).a
 
 
 PROG = lib$(LIB_NAME).a
 

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

 
 ifeq ($(STG_TIME), yes)
 DEFS += -DSTG_TIME
 
 ifeq ($(STG_TIME), yes)
 DEFS += -DSTG_TIME


@@ -22,29 +22,17 @@ endif
 
 OBJS = $(notdir $(patsubst %.cpp, %.o, $(patsubst %.c, %.o, $(SRCS))))
 
 
 OBJS = $(notdir $(patsubst %.cpp, %.o, $(patsubst %.c, %.o, $(SRCS))))
 

-#INST_INCS = $(addprefix $(DIR_INCLUDE)/, $(notdir $(INCS)))
-#INST_LIBS = $(DIR_LIB)/lib$(LIB_NAME)
-
-CXXFLAGS += -fPIC
-CFLAGS += -fPIC
-
-vpath %.a $(DIR_LIB)
+CXXFLAGS += -fPIC $(SEARCH_DIRS) $(DEFS)
+CFLAGS += -fPIC $(SEARCH_DIRS) $(DEFS)

 
 all: $(PROG)
 
 
 all: $(PROG)
 

-$(PROG): $(OBJS) $(STGLIBS)
+$(PROG): $(OBJS)

        ar rc lib$(LIB_NAME).a $(OBJS)
        ranlib lib$(LIB_NAME).a
        ar rc lib$(LIB_NAME).a $(OBJS)
        ranlib lib$(LIB_NAME).a

-       #cp *.a $(DIR_LIB)
-
-#includes: $(INCS)
-#      cp -p $(INCS) $(DIR_INCLUDE)/stg

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

-       #for file in $(INCS); do \
-       #    rm -f $(DIR_INCLUDE)/stg/$$file; \
-       #done

 
 install: $(PROG)
        mkdir -m $(DIR_MODE) -p $(PREFIX)/usr/lib/stg
 
 install: $(PROG)
        mkdir -m $(DIR_MODE) -p $(PREFIX)/usr/lib/stg


@@ -72,11 +60,10 @@ deps:       $(SRCS) ../../Makefile.conf
          echo "$$file" | grep ".c$$" > /dev/null;\
          if [ $$? == 0 ];\
          then\
          echo "$$file" | grep ".c$$" > /dev/null;\
          if [ $$? == 0 ];\
          then\

-           echo "`$(CC) $(CFLAGS) $(SEARCH_DIRS) $(DEFS) -MM $$file` Makefile ../../Makefile.conf" >> deps ;\
-           echo -e '\t$$(CC) $(CFLAGS) $(SEARCH_DIRS) $(DEFS) -c $$<' >> deps ;\
+           echo "`$(CC) $(CFLAGS) -MM $$file` Makefile ../../Makefile.conf" >> deps ;\
+           echo -e '\t$$(CC) $(CFLAGS) -c $$<' >> deps ;\

          else\
          else\

-           echo "`$(CXX) $(CXXFLAGS) $(SEARCH_DIRS) $(DEFS) -MM $$file` Makefile ../../Makefile.conf" >> deps ;\
-           echo -e '\t$$(CXX) $(CXXFLAGS) $(SEARCH_DIRS) $(DEFS) -c $$<' >> deps ;\
+           echo "`$(CXX) $(CXXFLAGS) -MM $$file` Makefile ../../Makefile.conf" >> deps ;\
+           echo -e '\t$$(CXX) $(CXXFLAGS) -c $$<' >> deps ;\

          fi;\
        done
          fi;\
        done

-

diff --git a/stglibs/dotconfpp.lib/Makefile b/stglibs/dotconfpp.lib/Makefile
index 3acce9221fbd59e4406fd85cd44b515bd6ff58b4..52c4483351f6c77a52501a2044b45bb901e7ba16 100644 (file)
--- a/stglibs/dotconfpp.lib/Makefile
+++ b/stglibs/dotconfpp.lib/Makefile
@@ -2,7 +2,7 @@
 # $Id: Makefile,v 1.3 2007/05/08 14:29:19 faust Exp $
 ###############################################################################
 
 # $Id: Makefile,v 1.3 2007/05/08 14:29:19 faust Exp $
 ###############################################################################
 

-LIB_NAME = dotconfpp
+LIB_NAME = stgdotconfpp

 
 SRCS = dotconfpp.cpp \
        mempool.cpp
 
 SRCS = dotconfpp.cpp \
        mempool.cpp

diff --git a/stglibs/ibpp.lib/Makefile b/stglibs/ibpp.lib/Makefile
index 59eded2ff8ca0d263fc22a7dd5b2cd4d09242b9f..80a895e9eaecfc9a268ee1778e73afffdf41e5d2 100644 (file)
--- a/stglibs/ibpp.lib/Makefile
+++ b/stglibs/ibpp.lib/Makefile
@@ -2,7 +2,7 @@
 # $Id: Makefile,v 1.6 2009/03/03 15:50:15 faust Exp $
 ###############################################################################
 
 # $Id: Makefile,v 1.6 2009/03/03 15:50:15 faust Exp $
 ###############################################################################
 

-LIB_NAME = ibpp
+LIB_NAME = stgibpp

 
 SRCS = array.cpp \
        blob.cpp \
 
 SRCS = array.cpp \
        blob.cpp \