Stylistic changes in RESETABLE

[stg.git] / stglibs / Makefile.in

diff --git a/stglibs/Makefile.in b/stglibs/Makefile.in
index c6db5f999c9b26f4ae5ba73a03de1cda599eee17..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,35 +21,38 @@ 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)

-       cp -p $(INCS) $(DIR_INCLUDE)
+       cp -p $(INCS) $(DIR_INCLUDE)/stg

 
 clean:
        rm -f deps $(PROG) *.o *.a *.so tags *.*~ 
        for file in $(INCS); do \
 
 clean:
        rm -f deps $(PROG) *.o *.a *.so tags *.*~ 
        for file in $(INCS); do \

-           rm -f $(DIR_INCLUDE)/$$file; \
+           rm -f $(DIR_INCLUDE)/stg/$$file; \

        done
 
 install: $(PROG)
        done
 
 install: $(PROG)

-       mkdir -m $(BIN_MODE) -p $(PREFIX)/usr/lib/stg
+       mkdir -m $(DIR_MODE) -p $(PREFIX)/usr/lib/stg

        install -m $(BIN_MODE) -o $(OWNER) -s $(PROG) $(PREFIX)/usr/lib/stg/$(PROG)
        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) $(INCS) $(PREFIX)/usr/include/stg/

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

+       for file in $(INCS); do \
+           rm -f $(PREFIX)/usr/include/stg/$$file; \
+       done

 
 ifneq ($(MAKECMDGOALS),includes)
 ifneq ($(MAKECMDGOALS),clean)
 
 ifneq ($(MAKECMDGOALS),includes)
 ifneq ($(MAKECMDGOALS),clean)


@@ -84,7 +65,7 @@ endif
 deps:  $(SRCS) ../../Makefile.conf
        @>deps ;\
        for file in $(SRCS); do\
 deps:  $(SRCS) ../../Makefile.conf
        @>deps ;\
        for file in $(SRCS); do\

-         echo "`$(CC) $(CXXFLAGS) $(SEARCH_DIRS) $(DEFS) -MM -MG $$file` Makefile ../../Makefile.conf" >> deps ;\
+         echo "`$(CC) $(CXXFLAGS) $(SEARCH_DIRS) $(DEFS) -MM $$file` Makefile ../../Makefile.conf" >> deps ;\

          echo -e '\t$$(CC) $(CXXFLAGS) $(SEARCH_DIRS) $(DEFS) -c $$<' >> deps ;\
        done
 
          echo -e '\t$$(CC) $(CXXFLAGS) $(SEARCH_DIRS) $(DEFS) -c $$<' >> deps ;\
        done