diff options
Diffstat (limited to 'dist/makesystem.patch')
| -rw-r--r-- | dist/makesystem.patch | 134 |
1 files changed, 134 insertions, 0 deletions
diff --git a/dist/makesystem.patch b/dist/makesystem.patch index 982dd3f..f36c1ee 100644 --- a/dist/makesystem.patch +++ b/dist/makesystem.patch @@ -1370,6 +1370,73 @@ diff --new-file -ru Lorene.orig/C++/Source/Cmp/Makefile_lib_g Lorene/C++/Source/ %.o: %.C @$(MAKEDEPEND); \ +diff --new-file -ru Lorene.orig/C++/Source/Compobj/Makefile Lorene/C++/Source/Compobj/Makefile +--- Lorene.orig/C++/Source/Compobj/Makefile 2006-09-11 13:28:40.000000000 +0200 ++++ Lorene/C++/Source/Compobj/Makefile 2014-03-27 15:35:51.672739947 +0100 +@@ -1,22 +1,24 @@ + SHELL=/bin/sh + +-include $(HOME_LORENE)/local_settings # defines which compiler,... +- +-BIN_TOOLS = $(HOME_LORENE)/bin ++include $(HOME_LORENE)/global_settings # defines which compiler,... + + SRC = *.C + + install: $(SRC) Objects Objects_g + mkdir -p $(DEPDIR) +- echo *C | $(BIN_TOOLS)/pointCpointo > List_obj # list of *.o files ++ echo 'OBJ = $(patsubst %.C,%.o,$(wildcard *.C))' > List_obj # list of *.o files ++ifndef DONTBUILDDEBUGLIB ++ touch Objects_g/_rien.o + mv Objects_g/*.o . +- mv _rien.o Objects_g + $(MAKE) -f Makefile_lib_g + mv *.o Objects_g ++ rm Objects_g/_rien.o ++endif ++ touch Objects/_rien.o + mv Objects/*.o . +- mv _rien.o Objects + $(MAKE) -f Makefile_lib + mv *.o Objects ++ rm Objects/_rien.o + + uninstall: + rm -f *.o +@@ -27,8 +29,6 @@ + + Objects: + mkdir Objects +- touch Objects/_rien.o + + Objects_g: + mkdir Objects_g +- touch Objects_g/_rien.o +diff --new-file -ru Lorene.orig/C++/Source/Compobj/Makefile_lib Lorene/C++/Source/Compobj/Makefile_lib +--- Lorene.orig/C++/Source/Compobj/Makefile_lib 2006-09-11 13:28:40.000000000 +0200 ++++ Lorene/C++/Source/Compobj/Makefile_lib 2014-03-27 15:35:51.674739890 +0100 +@@ -8,8 +8,6 @@ + LIB = $(HOME_LORENE)/Lib + + $(LIB)/date_mark : $(OBJ) +- ar -rv $(LIB)/liblorene.a $? +- $(RANLIB) $(LIB)/liblorene.a + + %.o: %.C + @$(MAKEDEPEND); \ +diff --new-file -ru Lorene.orig/C++/Source/Compobj/Makefile_lib_g Lorene/C++/Source/Compobj/Makefile_lib_g +--- Lorene.orig/C++/Source/Compobj/Makefile_lib_g 2006-09-11 13:28:41.000000000 +0200 ++++ Lorene/C++/Source/Compobj/Makefile_lib_g 2014-03-27 15:35:51.677739804 +0100 +@@ -8,8 +8,6 @@ + LIB = $(HOME_LORENE)/Lib + + $(LIB)/date_mark : $(OBJ) +- ar -rv $(LIB)/liblorene_g.a $? +- $(RANLIB) $(LIB)/liblorene_g.a + + %.o: %.C + @$(MAKEDEPEND); \ diff --new-file -ru Lorene.orig/C++/Source/Connection/Makefile Lorene/C++/Source/Connection/Makefile --- Lorene.orig/C++/Source/Connection/Makefile 2006-09-11 13:28:42.000000000 +0200 +++ Lorene/C++/Source/Connection/Makefile 2014-03-27 15:35:51.681739690 +0100 @@ -1849,6 +1916,73 @@ diff --new-file -ru Lorene.orig/C++/Source/Excised_slice/Makefile_lib_g Lorene/C %.o: %.C @$(MAKEDEPEND); \ +diff --new-file -ru Lorene.orig/C++/Source/Gravastar/Makefile Lorene/C++/Source/Gravastar/Makefile +--- Lorene.orig/C++/Source/Gravastar/Makefile 2006-09-11 13:28:48.000000000 +0200 ++++ Lorene/C++/Source/Gravastar/Makefile 2014-03-27 15:35:51.739738035 +0100 +@@ -1,22 +1,24 @@ + SHELL=/bin/sh + +-include $(HOME_LORENE)/local_settings # defines which compiler,... +- +-BIN_TOOLS = $(HOME_LORENE)/bin ++include $(HOME_LORENE)/global_settings # defines which compiler,... + + SRC = *.C + + install: $(SRC) Objects Objects_g + mkdir -p $(DEPDIR) +- echo *C | $(BIN_TOOLS)/pointCpointo > List_obj # list of *.o files ++ echo 'OBJ = $(patsubst %.C,%.o,$(wildcard *.C))' > List_obj # list of *.o files ++ifndef DONTBUILDDEBUGLIB ++ touch Objects_g/_rien.o + mv Objects_g/*.o . +- mv _rien.o Objects_g + $(MAKE) -f Makefile_lib_g + mv *.o Objects_g ++ rm Objects_g/_rien.o ++endif ++ touch Objects/_rien.o + mv Objects/*.o . +- mv _rien.o Objects + $(MAKE) -f Makefile_lib + mv *.o Objects ++ rm Objects/_rien.o + + uninstall: + rm -f *.o +@@ -27,8 +29,6 @@ + + Objects: + mkdir Objects +- touch Objects/_rien.o + + Objects_g: + mkdir Objects_g +- touch Objects_g/_rien.o +diff --new-file -ru Lorene.orig/C++/Source/Gravastar/Makefile_lib Lorene/C++/Source/Gravastar/Makefile_lib +--- Lorene.orig/C++/Source/Gravastar/Makefile_lib 2006-09-11 13:28:48.000000000 +0200 ++++ Lorene/C++/Source/Gravastar/Makefile_lib 2014-03-27 15:35:51.742737949 +0100 +@@ -8,8 +8,6 @@ + LIB = $(HOME_LORENE)/Lib + + $(LIB)/date_mark : $(OBJ) +- ar -rv $(LIB)/liblorene.a $? +- $(RANLIB) $(LIB)/liblorene.a + + %.o: %.C + @$(MAKEDEPEND); \ +diff --new-file -ru Lorene.orig/C++/Source/Gravastar/Makefile_lib_g Lorene/C++/Source/Gravastar/Makefile_lib_g +--- Lorene.orig/C++/Source/Gravastar/Makefile_lib_g 2006-09-11 13:28:49.000000000 +0200 ++++ Lorene/C++/Source/Gravastar/Makefile_lib_g 2014-03-27 15:35:51.745737864 +0100 +@@ -8,8 +8,6 @@ + LIB = $(HOME_LORENE)/Lib + + $(LIB)/date_mark : $(OBJ) +- ar -rv $(LIB)/liblorene_g.a $? +- $(RANLIB) $(LIB)/liblorene_g.a + + %.o: %.C + @$(MAKEDEPEND); \ diff --new-file -ru Lorene.orig/C++/Source/Grille3d/Makefile Lorene/C++/Source/Grille3d/Makefile --- Lorene.orig/C++/Source/Grille3d/Makefile 2006-09-11 13:28:48.000000000 +0200 +++ Lorene/C++/Source/Grille3d/Makefile 2014-03-27 15:35:51.739738035 +0100 |