singular/fix-parallel-make.patch

   1 diff -ur Singular-3-1-1.orig/factory/GNUmakefile.in Singular-3-1-1/factory/GNUmakefile.in
   2 --- Singular-3-1-1.orig/factory/GNUmakefile.in  2010-05-07 19:26:37.000000000 +0200
   3 +++ Singular-3-1-1/factory/GNUmakefile.in       2010-06-20 17:54:06.509063447 +0200
   4 @@ -430,15 +430,15 @@
   5  #
   6
   7  # how to create library objets
   8 -%.o: %.cc config.h
   9 +%.o: %.cc factoryconf.h config.h
  10         $(CXX) -c $< $(LIBCXXFLAGS) -o $@
  11 -%.o: %.c config.h
  12 +%.o: %.c factoryconf.h config.h
  13         $(CC) -c $< $(LIBCFLAGS) -o $@
  14  # the debug version:
  15 -%.og: %.cc config.h
  16 +%.og: %.cc factoryconf.h config.h
  17         $(CXX) -g -c $< $(LIBCGGFLAGS) -o $@
  18  # the profiling version:
  19 -%.op: %.cc config.h
  20 +%.op: %.cc factoryconf.h config.h
  21         $(CXX) -O -pg -c $< $(LIBCGGFLAGS) -o $@
  22
  23  # how to create dependency files.  To avoid broken dependency files
  24 diff -ur Singular-3-1-1.orig/libfac/Makefile.in Singular-3-1-1/libfac/Makefile.in
  25 --- Singular-3-1-1.orig/libfac/Makefile.in      2010-01-29 10:10:49.000000000 +0100
  26 +++ Singular-3-1-1/libfac/Makefile.in   2010-06-20 17:56:37.511131412 +0200
  27 @@ -86,6 +86,11 @@
  28  OPTOBJ:
  29         ${MKINSTALLDIRS} OPTOBJ
  30
  31 +${OPTFACTOROBJ}: OPTOBJ
  32 +${OPTCHARSETOBJ}: OPTOBJ
  33 +${DEBOBJ}: OPTOBJ
  34 +${PROFOBJ}: OPTOBJ
  35 +
  36  OPTOBJ/%.o: %.cc
  37         $(CXX) $(CXXFLAGS) $(CXXTEMPLFLAGS) $(CPPFLAGS) $(DEFS) -c $< -o $@
  38
  39 diff -ur Singular-3-1-1.orig/omalloc/Makefile.in Singular-3-1-1/omalloc/Makefile.in
  40 --- Singular-3-1-1.orig/omalloc/Makefile.in     2010-01-29 10:10:49.000000000 +0100
  41 +++ Singular-3-1-1/omalloc/Makefile.in  2010-06-20 17:54:06.509063447 +0200
  42 @@ -130,6 +130,8 @@
  43  omalloc.h: $(HEADERS)
  44         ./makeheader om_Alloc.h $@
  45
  46 +omalloc.o omalloc_debug.o: omalloc.h
  47 +
  48  omalloc.o: omalloc.c
  49         ${CC} ${CFLAGS} ${CPPFLAGS} ${DEFS} -DOM_NDEBUG -c $< -o $@
  50
  51 --- Singular-3-1-1.orig/Singular/Makefile.in    2010-06-20 18:58:33.491177132 +0200
  52 +++ Singular-3-1-1/Singular/Makefile.in 2010-06-20 19:02:19.881153252 +0200
  53 @@ -361,15 +361,17 @@
  54  %.static: version.h
  55         ${MAKE} DL_KERNEL=0 S_EXT=".static" $@
  56
  57 -iparith.o mpsr_Tok.o : iparith.inc mpsr_Tok.inc
  58 +iparith.o mpsr_Tok.o : iparith.inc
  59
  60  cntrlc.o cntrlc.og : feOptES.inc feOptTS.inc feOpt.inc
  61 +
  62 +cntrlc.o cntrlc.og misc_ip.o misc_ip.og emacs.o tesths.o: version.h
  63
  64  claptmpl.o: claptmpl.cc mod2.h
  65         ${CXX} ${CXXFLAGS}  ${CPPFLAGS} ${DEFS} -c $<
  66
  67 -iparith.inc mpsr_Tok.inc: claptmpl.o iparith.cc \
  68 -                          ipconv.cc tok.h mpsr_Tok.cc grammar.h mod2.h
  69 +iparith.inc: claptmpl.o iparith.cc \
  70 +                          ipconv.cc tok.h mpsr_Tok.cc grammar.h mod2.h ${OBJS}
  71         ${CXX} ${CXXFLAGS} ${CPPFLAGS} ${CXXTEMPLFLAGS} ${DEFS} -DGENTABLE \
  72              -o gentable claptmpl.o iparith.cc tesths.cc mpsr_Tok.cc \
  73              ${OBJS} ${LDFLAGS} ${LIBS} ../kernel/mmalloc.o
  74 @@ -421,15 +421,17 @@
  75         ./feOpt
  76         /bin/rm -f feOpt feOpt.exe
  77
  78 +fehelp.cc: feOpt.inc
  79 +
  80  feOptES.inc: feOpt.cc mod2.h
  81 -       $(CXX) -DGENERATE_OPTION_INDEX  -DESINGULAR -I../kernel feOpt.cc -o feOpt
  82 -       ./feOpt
  83 -       rm -f feOpt feOpt.exe
  84 +       $(CXX) -DGENERATE_OPTION_INDEX  -DESINGULAR -I../kernel feOpt.cc -o feOptES
  85 +       ./feOptES
  86 +       rm -f feOptES feOptES.exe
  87
  88  feOptTS.inc: feOpt.cc mod2.h
  89 -       $(CXX) -DGENERATE_OPTION_INDEX  -DTSINGULAR -I../kernel feOpt.cc -o feOpt
  90 -       ./feOpt
  91 -       rm -f feOpt feOpt.exe
  92 +       $(CXX) -DGENERATE_OPTION_INDEX  -DTSINGULAR -I../kernel feOpt.cc -o feOptTS
  93 +       ./feOptTS
  94 +       rm -f feOptTS feOptTS.exe
  95
  96  mpsr.so: $(MPSR_SOURCES:.cc=.dl_o)
  97         $(LD) ${SLDFLAGS} -o $@ $^ -L${libdir} ${MP_LIBS} ${GLIBC_DYN_FIX}