From: jason@jarthur.claremont.edu (Jason Merrill)
Subject: Makefile fixes for parallel make on Sequents
Organization: Harvey Mudd College
Distribution: gnu
Date: Sun, 29 Mar 1992 00:42:52 GMT

I went through and modified most of the makefiles so that the targets could
be make in parallel on our Sequent Symmetry.  So without further ado, here
are the diffs:

diff -r -c libg++/gperf/src/Makefile.in /gnu/libg++-2.0/libg++/gperf/src/Makefile.in
*** libg++/gperf/src/Makefile.in	Sat Mar  7 16:05:56 1992
--- /gnu/libg++-2.0/libg++/gperf/src/Makefile.in	Thu Mar 26 11:05:54 1992
***************
*** 108,114
  .PHONY: check
  check:
  
! gperf: $(OBJECTS) 
  	$(CC) -o $@ $(OBJECTS) $(LIBS)
  
  .PHONY: install

--- 108,114 -----
  .PHONY: check
  check:
  
! gperf: $(P) $(OBJECTS) 
  	$(CC) -o $@ $(OBJECTS) $(LIBS)
  
  .PHONY: install
diff -r -c libg++/iostream/Makefile.in /gnu/libg++-2.0/libg++/iostream/Makefile.in
*** libg++/iostream/Makefile.in	Tue Mar 10 18:14:11 1992
--- /gnu/libg++-2.0/libg++/iostream/Makefile.in	Thu Mar 26 10:57:31 1992
***************
*** 109,115
  	$(MAKE) "CC=$(CC)" "XTRAFLAGS=$(XTRAFLAGS)" \
  		"AR=$(AR)" "RANLIB=$(RANLIB)" $(TARGETLIB)
  
! $(TARGETLIB): $(IOSTREAM_OBS) force
  	-rm -f $(TARGETLIB)
  	$(AR) $(AR_FLAGS) $(TARGETLIB) $(IOSTREAM_OBS)
  	$(RANLIB) $(TARGETLIB)

--- 109,117 -----
  	$(MAKE) "CC=$(CC)" "XTRAFLAGS=$(XTRAFLAGS)" \
  		"AR=$(AR)" "RANLIB=$(RANLIB)" $(TARGETLIB)
  
! iostream_obs: $(P) $(IOSTREAM_OBS)
! 
! $(TARGETLIB): iostream_obs force
  	-rm -f $(TARGETLIB)
  	$(AR) $(AR_FLAGS) $(TARGETLIB) $(IOSTREAM_OBS)
  	$(RANLIB) $(TARGETLIB)
diff -r -c libg++/iostream/stdio/Makefile.in /gnu/libg++-2.0/libg++/iostream/stdio/Makefile.in
*** libg++/iostream/stdio/Makefile.in	Sat Mar  7 16:06:24 1992
--- /gnu/libg++-2.0/libg++/iostream/stdio/Makefile.in	Fri Mar 27 17:55:59 1992
***************
*** 96,102
  .PHONY: check
  check:
  
! $(TARGETLIB): $(STDIO_OBJECTS)
  	$(AR) $(AR_FLAGS) $(TARGETLIB) $(STDIO_OBJECTS)
  	$(RANLIB) $(TARGETLIB)	
  

--- 96,102 -----
  .PHONY: check
  check:
  
! $(TARGETLIB):$(P) $(STDIO_OBJECTS)
  	$(AR) $(AR_FLAGS) $(TARGETLIB) $(STDIO_OBJECTS)
  	$(RANLIB) $(TARGETLIB)	
  
diff -r -c libg++/iostream/test/Makefile.in /gnu/libg++-2.0/libg++/iostream/test/Makefile.in
*** libg++/iostream/test/Makefile.in	Sat Mar  7 16:06:30 1992
--- /gnu/libg++-2.0/libg++/iostream/test/Makefile.in	Thu Mar 26 11:06:58 1992
***************
*** 53,59
  
  DEPEND_SOURCES = $(srcdir)/*.C
  
! .SUFFIXES: .o .c
  
  .C.o:
  	$(CC) $(CFLAGS) $(XTRAFLAGS) -c $<

--- 53,59 -----
  
  DEPEND_SOURCES = $(srcdir)/*.C
  
! .SUFFIXES: .o .C
  
  .C.o:
  	$(CC) $(CFLAGS) $(XTRAFLAGS) -c $<
Only in libg++/proto-kit: Makefile
diff -r -c libg++/src/Makefile.in /gnu/libg++-2.0/libg++/src/Makefile.in
*** libg++/src/Makefile.in	Sat Mar  7 16:06:50 1992
--- /gnu/libg++-2.0/libg++/src/Makefile.in	Thu Mar 26 10:09:43 1992
***************
*** 129,135
  	$(MAKE) "CC=$(CC)" "XTRAFLAGS=$(XTRAFLAGS)" \
  		"AR=$(AR)" "RANLIB=$(RANLIB)" $(TARGETLIB)
  
! $(TARGETLIB): $(OBJS)
  	$(AR) $(AR_FLAGS) $(TARGETLIB) $(OBJS)
  	$(RANLIB) $(TARGETLIB)
  

--- 129,135 -----
  	$(MAKE) "CC=$(CC)" "XTRAFLAGS=$(XTRAFLAGS)" \
  		"AR=$(AR)" "RANLIB=$(RANLIB)" $(TARGETLIB)
  
! $(TARGETLIB): $(P) $(OBJS)
  	$(AR) $(AR_FLAGS) $(TARGETLIB) $(OBJS)
  	$(RANLIB) $(TARGETLIB)
  
diff -r -c libg++/tests/Makefile.in /gnu/libg++-2.0/libg++/tests/Makefile.in
*** libg++/tests/Makefile.in	Sat Mar  7 16:07:11 1992
--- /gnu/libg++-2.0/libg++/tests/Makefile.in	Thu Mar 26 11:42:07 1992
***************
*** 107,112
    tList tPlex tLList tVec tStack tQueue tDeque tPQ tSet \
    tBag  tMap 
  
  # files for archived prototype classes
  LOBJS = \
   iList.o iSLList.o iDLList.o iVec.o iAVec.o \

--- 107,118 -----
    tList tPlex tLList tVec tStack tQueue tDeque tPQ tSet \
    tBag  tMap 
  
+ TOBJS =  test_h.o tFile.o tObstack.o tString.o \
+   tInteger.o tRational.o tComplex.o tBitSet.o tBitString.o \
+   tRandom.o tFix.o tFix16.o tFix24.o tCurses.o tGetOpt.o \
+   tList.o tPlex.o tLList.o tVec.o tStack.o tQueue.o tDeque.o tPQ.o tSet.o \
+   tBag.o tMap.o 
+ 
  # files for archived prototype classes
  LOBJS = \
   iList.o iSLList.o iDLList.o iVec.o iAVec.o \
***************
*** 136,142
  
  LHDRS =  idefs.h 
  
! TESTS = test_h libtest.a $(TOUTS)
  
  #### host and target dependent Makefile fragments come in here.
  ##

--- 142,148 -----
  
  LHDRS =  idefs.h 
  
! TESTS = test_h libtest.a tobjs touts
  
  #### host and target dependent Makefile fragments come in here.
  ##
***************
*** 178,183
  EXPECTED_OUTPUT = out.$(IO_DIR)
  LIBTEST=libtest.a
  
  tests checktests: clean_tests $(TESTS) $(srcdir)/$(EXPECTED_OUTPUT)
  	-$(MAKE) -s runtests > my.out 2>&1
  	-diff -b $(srcdir)/$(EXPECTED_OUTPUT) my.out > checktests.diffs

--- 184,192 -----
  EXPECTED_OUTPUT = out.$(IO_DIR)
  LIBTEST=libtest.a
  
+ tobjs: $(P) $(TOBJS)
+ touts: $(P) $(TOUTS)
+ 
  tests checktests: clean_tests $(TESTS) $(srcdir)/$(EXPECTED_OUTPUT)
  	-$(MAKE) -s runtests > my.out 2>&1
  	-diff -b $(srcdir)/$(EXPECTED_OUTPUT) my.out > checktests.diffs
***************
*** 187,192
  	$(CC) test_h.o -o $@ $(LIBS) -lm
  	
  
  	
  $(LIBTEST): $(LHDRS) $(LOBJS)
  	rm -f $(LIBTEST)

--- 196,204 -----
  	$(CC) test_h.o -o $@ $(LIBS) -lm
  	
  
+ lhdrs: $(P) $(LHDRS) 
+ lsrcs: $(P) $(LSRCS) 
+ lobjs: $(P) $(LOBJS)
  	
  $(LIBTEST): lhdrs lsrcs lobjs
  	rm -f $(LIBTEST)
***************
*** 188,194
  	
  
  	
! $(LIBTEST): $(LHDRS) $(LOBJS)
  	rm -f $(LIBTEST)
  	$(AR) r $(LIBTEST) $(LOBJS)
  	$(RANLIB) $(LIBTEST)

--- 200,206 -----
  lsrcs: $(P) $(LSRCS) 
  lobjs: $(P) $(LOBJS)
  	
! $(LIBTEST): lhdrs lsrcs lobjs
  	rm -f $(LIBTEST)
  	$(AR) r $(LIBTEST) $(LOBJS)
  	$(RANLIB) $(LIBTEST)

Newsgroups: gnu.g++.lib.bug