Add rules count method to the traffcounter iface

[stg.git] / stglibs / Makefile.in

diff --git a/stglibs/Makefile.in b/stglibs/Makefile.in
index a0c854e6ec105ddbcddacacd6c1c5828f53e4c29..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)


@@ -70,7 +46,7 @@ install: $(PROG)
        mkdir -m $(DIR_MODE) -p $(PREFIX)/usr/lib/stg
        install -m $(BIN_MODE) -o $(OWNER) -s $(PROG) $(PREFIX)/usr/lib/stg/$(PROG)
        mkdir -m $(DIR_MODE) -p $(PREFIX)/usr/include/stg
        mkdir -m $(DIR_MODE) -p $(PREFIX)/usr/lib/stg
        install -m $(BIN_MODE) -o $(OWNER) -s $(PROG) $(PREFIX)/usr/lib/stg/$(PROG)
        mkdir -m $(DIR_MODE) -p $(PREFIX)/usr/include/stg

-       install -m $(DATA_MODE) -o $(OWNER) -t $(PREFIX)/usr/include/stg/ $(INCS)
+       install -m $(DATA_MODE) -o $(OWNER) $(INCS) $(PREFIX)/usr/include/stg/

 
 uninstall:
        rm -f $(PREFIX)/usr/lib/stg/$(PROG)
 
 uninstall:
        rm -f $(PREFIX)/usr/lib/stg/$(PROG)