Fix compilation and linkage issues

diff --git a/projects/convertor/Makefile b/projects/convertor/Makefile
index 569917d2138c6d656b561457566b521cd38610e2..86ab6ed3dd1b305db53e7980e8d1179f5dfe70ce 100644 (file)
--- a/projects/convertor/Makefile
+++ b/projects/convertor/Makefile
@@ -29,7 +29,7 @@ OBJS = $(notdir $(patsubst %.cpp, %.o, $(patsubst %.c, %.o, $(SRCS))))
 CXXFLAGS += -Wall
 LDFLAGS += -Wl,-E -L$(DIR_LIB) -Wl,-rpath,$(DIR_LIB)
 
 CXXFLAGS += -Wall
 LDFLAGS += -Wl,-E -L$(DIR_LIB) -Wl,-rpath,$(DIR_LIB)
 

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

 
 .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


@@ -41,7 +41,7 @@ plugins: libs
        $(MAKE) -C $(DIR_PLUGINS)
 
 $(PROG): $(OBJS) $(STGLIBS) 
        $(MAKE) -C $(DIR_PLUGINS)
 
 $(PROG): $(OBJS) $(STGLIBS) 

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

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

diff --git a/projects/rlm_stg/Makefile b/projects/rlm_stg/Makefile
index da1a57681cd6de3c768ac26f068eaaf231695d87..68cdb5be7cb2c887336e160efb69d5525d05c699 100644 (file)
--- a/projects/rlm_stg/Makefile
+++ b/projects/rlm_stg/Makefile
@@ -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

diff --git a/projects/rscriptd/Makefile b/projects/rscriptd/Makefile
index 2b6cbc1c4c6f2a778bd720dc93fa720a973876e5..a009a5c1d9359af5a6ff868f0f69fbc2935ae76b 100644 (file)
--- a/projects/rscriptd/Makefile
+++ b/projects/rscriptd/Makefile
@@ -18,12 +18,6 @@ STGLIBS =  -lstglogger \
 
 LIBS += $(LIB_THREAD)
 
 
 LIBS += $(LIB_THREAD)
 

-#ifeq ($(OS),linux)
-#LIBS += -ldl
-#else
-#LIBS += -lc
-#endif
-

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


@@ -31,7 +25,7 @@ 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)
 
 CXXFLAGS += -Wall
 LDFLAGS += -Wl,-E -L$(DIR_LIB) -Wl,-rpath,$(PREFIX)/usr/lib/stg -Wl,-rpath-link,$(DIR_LIB)
 

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

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


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

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

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

diff --git a/projects/sgauth/Makefile b/projects/sgauth/Makefile
index 338e35008f7be03b250236fc9dbdb1bed24e1255..cf2e2c5339bf7176b95287ed4adf7a5bd6cc1972 100644 (file)
--- a/projects/sgauth/Makefile
+++ b/projects/sgauth/Makefile
@@ -11,9 +11,9 @@ SRCS = ./main.cpp \
        ./web.cpp
 
 STGLIBS =  -lstgconffiles \
        ./web.cpp
 
 STGLIBS =  -lstgconffiles \

+           -lstgia \

            -lstgcrypto \
            -lstgcrypto \

-           -lstgcommon \
-           -lstgia
+           -lstgcommon

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


@@ -30,7 +30,7 @@ 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)
 
 CXXFLAGS += -Wall
 LDFLAGS += -Wl,-E -L$(DIR_LIB) -Wl,-rpath,$(PREFIX)/usr/lib/stg -Wl,-rpath-link,$(DIR_LIB)
 

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

 
 .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


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

diff --git a/projects/sgauthstress/Makefile b/projects/sgauthstress/Makefile
index 0dd514fe22409c723fd855e1658dc4d14fe8e243..4864da31caa597a227369447d5490d2a0d4d8b74 100644 (file)
--- a/projects/sgauthstress/Makefile
+++ b/projects/sgauthstress/Makefile
@@ -28,7 +28,7 @@ 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)
 
 CXXFLAGS += -Wall
 LDFLAGS += -Wl,-E -L$(DIR_LIB) -Wl,-rpath,$(PREFIX)/usr/lib/stg -Wl,-rpath-link,$(DIR_LIB)
 

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

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

diff --git a/projects/sgconf/Makefile b/projects/sgconf/Makefile
index 991355565f633aacbc52655f83df14464940a023..02f8d7b80bbe4b6e81ce13c5ced1e09a02088ec1 100644 (file)
--- a/projects/sgconf/Makefile
+++ b/projects/sgconf/Makefile
@@ -10,9 +10,9 @@ SRCS = ./main.cpp \
        ./common_sg.cpp
 
 STGLIBS =  -lstgconffiles \
        ./common_sg.cpp
 
 STGLIBS =  -lstgconffiles \

+           -lstgsrvconf \

            -lstgcommon \
            -lstgcommon \

-          -lstgcrypto \
-           -lstgsrvconf
+          -lstgcrypto

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


@@ -41,7 +41,7 @@ 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)
 
 CXXFLAGS += -Wall
 LDFLAGS += -Wl,-E -L$(DIR_LIB) -Wl,-rpath,$(PREFIX)/usr/lib/stg -Wl,-rpath-link,$(DIR_LIB)
 

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

 
 .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


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

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

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

diff --git a/projects/sgconf_xml/Makefile b/projects/sgconf_xml/Makefile
index 752f05a5f6c4a43a419c499c76f3675481e29bd5..2453ef5c971dff322306f9ad924b951d706d14b6 100644 (file)
--- a/projects/sgconf_xml/Makefile
+++ b/projects/sgconf_xml/Makefile
@@ -10,9 +10,9 @@ SRCS = ./main.cpp \
        ./parser.cpp
 
 LIBS =  -lstgconffiles \
        ./parser.cpp
 
 LIBS =  -lstgconffiles \

+        -lstgsrvconf \

         -lstgcrypto \
         -lstgcrypto \

-        -lstgcommon \
-        -lstgsrvconf
+        -lstgcommon

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


@@ -41,7 +41,7 @@ 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)
 
 CXXFLAGS += -Wall
 LDFLAGS += -Wl,-E -L$(DIR_LIB) -Wl,-rpath,$(PREFIX)/usr/lib/stg -Wl,-rpath-link,$(DIR_LIB)
 

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

 
 .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


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

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

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

diff --git a/projects/stargazer/user_impl.cpp b/projects/stargazer/user_impl.cpp
index ec271442bd428f7ebae398e195daad9d098ed99c..8c61523a835fb5ae25c45f0b23d29b421c5a4109 100644 (file)
--- a/projects/stargazer/user_impl.cpp
+++ b/projects/stargazer/user_impl.cpp
@@ -566,7 +566,7 @@ if (!fakeConnect)
                 id,
                 dirsStr);
 
                 id,
                 dirsStr);
 

-        ScriptExec(scriptOnConnectParams);
+        ScriptExec(scriptOnConnectParams.c_str());

         }
     else
         {
         }
     else
         {


@@ -623,7 +623,7 @@ if (!fakeDisconnect)
                 id,
                 dirsStr);
 
                 id,
                 dirsStr);
 

-        ScriptExec(scriptOnDisonnectParams);
+        ScriptExec(scriptOnDisonnectParams.c_str());

         }
     else
         {
         }
     else
         {


@@ -1032,7 +1032,7 @@ if (access(scriptOnAdd.c_str(), X_OK) == 0)
             scriptOnAdd.c_str(),
             login.c_str());
 
             scriptOnAdd.c_str(),
             login.c_str());
 

-    ScriptExec(scriptOnAddParams);
+    ScriptExec(scriptOnAddParams.c_str());

     }
 else
     {
     }
 else
     {


@@ -1054,7 +1054,7 @@ if (access(scriptOnDel.c_str(), X_OK) == 0)
             scriptOnDel.c_str(),
             login.c_str());
 
             scriptOnDel.c_str(),
             login.c_str());
 

-    ScriptExec(scriptOnDelParams);
+    ScriptExec(scriptOnDelParams.c_str());

     }
 else
     {
     }
 else
     {