Back to good old static libs (no more .so-hell!)

diff --git a/projects/stargazer/plugins/Makefile.in b/projects/stargazer/plugins/Makefile.in
index 23ff1eb9b9fe8878b1e7b40470b07c4db6222c7e..2b255304f646e9b433a58a070d6a646716bd72d2 100644 (file)
--- a/projects/stargazer/plugins/Makefile.in
+++ b/projects/stargazer/plugins/Makefile.in
@@ -11,7 +11,7 @@ LN = ln
 CXXFLAGS += -fPIC
 LDFLAGS += -shared -L$(DIR_LIB) -Wl,-rpath,$(PREFIX)/usr/lib/stg
 
 CXXFLAGS += -fPIC
 LDFLAGS += -shared -L$(DIR_LIB) -Wl,-rpath,$(PREFIX)/usr/lib/stg
 

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

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

diff --git a/stglibs/Makefile.in b/stglibs/Makefile.in
index e1084b7b87dba977877eec173e6d8f7a667c63a6..b4344254ddc1dd3ddb72350005f17cbf796bc5a5 100644 (file)
--- a/stglibs/Makefile.in
+++ b/stglibs/Makefile.in
@@ -4,29 +4,7 @@
 
 include ../../Makefile.conf
 
 
 include ../../Makefile.conf
 

-PROG = lib$(LIB_NAME).so
-
-ifeq ($(PROT), on)
-DEFS += -DLINPROT
-endif
-
-ifeq ($(DEMO), on)
-DEFS += -DDEMO
-endif
-
-ifeq ($(OS), bsd)
-    ifeq ($(PROT), on)
-    DEFS += -DFREEBDSPROT
-    endif
-MAKE = gmake
-endif
-
-ifeq ($(OS), bsd5)
-    ifeq ($(PROT), on)
-    DEFS += -DFREEBDSPROT
-    endif
-MAKE = gmake
-endif
+PROG = lib$(LIB_NAME).a

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


@@ -43,18 +21,16 @@ OBJS = $(notdir $(patsubst %.cpp, %.o, $(patsubst %.c, %.o, $(SRCS))))
 INST_INCS = $(addprefix $(DIR_INCLUDE)/, $(notdir $(INCS)))
 INST_LIBS = $(DIR_LIB)/lib$(LIB_NAME)
 
 INST_INCS = $(addprefix $(DIR_INCLUDE)/, $(notdir $(INCS)))
 INST_LIBS = $(DIR_LIB)/lib$(LIB_NAME)
 

-CXXFLAGS += -fPIC $(DEFS)
-LDFLAGS += -shared -Wl,-rpath,$(PREFIX)/usr/lib/stg
+CXXFLAGS += -fPIC
+CFLAGS += -fPIC

 
 

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

 
 all: $(PROG)
 
 $(PROG): $(OBJS) $(STGLIBS)
 
 all: $(PROG)
 
 $(PROG): $(OBJS) $(STGLIBS)

-       $(CXX) $(LDFLAGS) -Wl,-soname,$(PROG) $^ $(LIBS) -o $(PROG) -L $(DIR_LIB) 

        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 *.so $(DIR_LIB)

        cp *.a $(DIR_LIB)
 
 includes: $(INCS)
        cp *.a $(DIR_LIB)
 
 includes: $(INCS)

diff --git a/stglibs/smux.lib/Makefile b/stglibs/smux.lib/Makefile
index 450c6283e702fce48c1d5dce8b77500a1f51395b..9663b8cd175dfc3b42b1970f3adb984c21ece296 100644 (file)
--- a/stglibs/smux.lib/Makefile
+++ b/stglibs/smux.lib/Makefile
@@ -6,13 +6,15 @@ SRCS = $(wildcard *.c)
 
 INCS = $(wildcard *.h)
 
 
 INCS = $(wildcard *.h)
 

-ASN1_SOURCES = RFC1213-MIB.asn1 \
-              RFC1155-SMI.asn1 \
-              RFC1157-SNMP.asn1 \
-              SMUX.asn1
+.PHONY: asn1

 
 

-asn1: $(ASN1_SOURCES)
-       asn1c -fskeletons-copy -fcompound-names $^
-       rm Makefile.am.sample
+#ASN1_SOURCES = RFC1213-MIB.asn1 \
+#             RFC1155-SMI.asn1 \
+#             RFC1157-SNMP.asn1 \
+#             SMUX.asn1
+
+#asn1: $(ASN1_SOURCES)
+#      asn1c -fskeletons-copy -fcompound-names $^
+#      rm Makefile.am.sample

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