This is the mail archive of the gcc-patches@gcc.gnu.org mailing list for the GCC project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

PATCH: More Makefile cleanups


This patch trims 104 lines from the Makefile.  

I'm trying to reduce the number of places where the same commands are
replicated.

I'll give the build maintainers some time to reject the patch before
checking this in.

--
Mark Mitchell
CodeSourcery, LLC
mark@codesourcery.com

Index: Makefile.in
===================================================================
RCS file: /cvs/gcc/gcc/gcc/Makefile.in,v
retrieving revision 1.1144
diff -c -5 -p -r1.1144 Makefile.in
*** Makefile.in	29 Aug 2003 18:16:59 -0000	1.1144
--- Makefile.in	30 Aug 2003 01:20:40 -0000
*************** gencheck$(build_exeext) : gencheck.o $(B
*** 1397,1408 ****
  	$(CC_FOR_BUILD) $(BUILD_CFLAGS) $(BUILD_LDFLAGS) -o $@ \
  	 gencheck.o $(BUILD_LIBS)
  
  gencheck.o : gencheck.c gencheck.h tree.def $(BCONFIG_H) $(SYSTEM_H) \
  	coretypes.h $(GTM_H) $(lang_tree_files)
- 	$(CC_FOR_BUILD) -c $(BUILD_CFLAGS) $(BUILD_CPPFLAGS) $(INCLUDES) \
- 	  $(srcdir)/gencheck.c $(OUTPUT_OPTION)
  
  gencheck.h : s-gencheck ; @true
  s-gencheck : Makefile
  	ltf="$(lang_tree_files)"; for f in $$ltf; do \
  	    echo "#include \"$$f\""; \
--- 1397,1406 ----
*************** insn-conditions.o : insn-conditions.c $(
*** 1873,1884 ****
    insn-constants.h
  	$(CC_FOR_BUILD) -c $(BUILD_CFLAGS) $(BUILD_CPPFLAGS) $(INCLUDES) insn-conditions.c
  
  dummy-conditions.o : dummy-conditions.c $(BCONFIG_H) $(SYSTEM_H) \
    coretypes.h $(GTM_H) gensupport.h
- 	$(CC_FOR_BUILD) -c $(BUILD_CFLAGS) $(BUILD_CPPFLAGS) $(INCLUDES) \
- 	    $(srcdir)/dummy-conditions.c $(OUTPUT_OPTION)
  
  insn-flags.h: s-flags ; @true
  s-flags : $(md_file) genflags$(build_exeext) $(srcdir)/move-if-change
  	$(RUN_GEN) ./genflags$(build_exeext) $(md_file) > tmp-flags.h
  	$(SHELL) $(srcdir)/move-if-change tmp-flags.h insn-flags.h
--- 1871,1880 ----
*************** s-gtype: gengtype$(build_exeext) $(GTFIL
*** 2078,2194 ****
  # $(CONFIG_H) is omitted from the deps of the gen*.o
  # because these programs don't really depend on anything
  # about the target machine.  They do depend on config.h itself,
  # since that describes the host machine.
  
  read-rtl.o: read-rtl.c $(BCONFIG_H) $(SYSTEM_H) coretypes.h $(GTM_H) $(RTL_H) \
    $(OBSTACK_H) $(HASHTAB_H)
- 	$(CC_FOR_BUILD) -c $(BUILD_CFLAGS) $(BUILD_CPPFLAGS) $(INCLUDES) $(srcdir)/read-rtl.c $(OUTPUT_OPTION)
  
  gensupport.o: gensupport.c $(BCONFIG_H) $(SYSTEM_H) coretypes.h $(GTM_H) $(RTL_H) \
    $(OBSTACK_H) errors.h $(HASHTAB_H) gensupport.h
- 	$(CC_FOR_BUILD) -c $(BUILD_CFLAGS) $(BUILD_CPPFLAGS) $(INCLUDES) $(srcdir)/gensupport.c $(OUTPUT_OPTION)
- 
- genconfig$(build_exeext) : genconfig.o $(BUILD_RTL) $(BUILD_SUPPORT) \
-   $(BUILD_PRINT) $(BUILD_ERRORS) $(BUILD_LIBDEPS)
- 	$(CC_FOR_BUILD) $(BUILD_CFLAGS) $(BUILD_LDFLAGS) -o $@ \
- 	  genconfig.o $(BUILD_RTL) $(BUILD_SUPPORT) $(BUILD_PRINT) \
- 	    $(BUILD_ERRORS) $(BUILD_LIBS)
  
  genconfig.o : genconfig.c $(RTL_H) $(BCONFIG_H) \
    $(SYSTEM_H) coretypes.h $(GTM_H) errors.h gensupport.h
- 	$(CC_FOR_BUILD) -c $(BUILD_CFLAGS) $(BUILD_CPPFLAGS) $(INCLUDES) $(srcdir)/genconfig.c $(OUTPUT_OPTION)
- 
- genflags$(build_exeext) : genflags.o $(BUILD_RTL) $(BUILD_SUPPORT) \
-   $(BUILD_PRINT) $(BUILD_ERRORS) $(BUILD_LIBDEPS)
- 	$(CC_FOR_BUILD) $(BUILD_CFLAGS) $(BUILD_LDFLAGS) -o $@ \
- 	 genflags.o $(BUILD_RTL) $(BUILD_SUPPORT) $(BUILD_PRINT) \
- 	    $(BUILD_ERRORS) $(BUILD_LIBS)
  
  genflags.o : genflags.c $(RTL_H) $(OBSTACK_H) $(BCONFIG_H) \
    $(SYSTEM_H) coretypes.h $(GTM_H) errors.h gensupport.h
- 	$(CC_FOR_BUILD) -c $(BUILD_CFLAGS) $(BUILD_CPPFLAGS) $(INCLUDES) $(srcdir)/genflags.c $(OUTPUT_OPTION)
- 
- gencodes$(build_exeext) : gencodes.o $(BUILD_RTL) $(BUILD_SUPPORT) \
-   $(BUILD_PRINT) $(BUILD_ERRORS) $(BUILD_LIBDEPS)
- 	$(CC_FOR_BUILD) $(BUILD_CFLAGS) $(BUILD_LDFLAGS) -o $@ \
- 	 gencodes.o $(BUILD_RTL) $(BUILD_SUPPORT) $(BUILD_PRINT) \
- 	    $(BUILD_ERRORS) $(BUILD_LIBS)
  
  gencodes.o : gencodes.c $(RTL_H) $(BCONFIG_H) \
    $(SYSTEM_H) coretypes.h $(GTM_H) errors.h gensupport.h
- 	$(CC_FOR_BUILD) -c $(BUILD_CFLAGS) $(BUILD_CPPFLAGS) $(INCLUDES) $(srcdir)/gencodes.c $(OUTPUT_OPTION)
  
  genconstants$(build_exeext) : genconstants.o $(BUILD_RTL) $(BUILD_EARLY_SUPPORT) \
    $(BUILD_ERRORS) $(BUILD_LIBDEPS)
  	$(CC_FOR_BUILD) $(BUILD_CFLAGS) $(BUILD_LDFLAGS) -o $@ \
  	 genconstants.o $(BUILD_EARLY_SUPPORT) $(BUILD_RTL) \
  	    $(BUILD_ERRORS) $(BUILD_LIBS)
  
  genconstants.o : genconstants.c $(RTL_H) $(BCONFIG_H) $(SYSTEM_H) coretypes.h $(GTM_H) \
    errors.h
- 	$(CC_FOR_BUILD) -c $(BUILD_CFLAGS) $(BUILD_CPPFLAGS) $(INCLUDES) $(srcdir)/genconstants.c $(OUTPUT_OPTION)
- 
- genemit$(build_exeext) : genemit.o $(BUILD_RTL) $(BUILD_SUPPORT) \
-   $(BUILD_PRINT) $(BUILD_ERRORS) $(BUILD_LIBDEPS)
- 	$(CC_FOR_BUILD) $(BUILD_CFLAGS) $(BUILD_LDFLAGS) -o $@ \
- 	 genemit.o $(BUILD_RTL) $(BUILD_SUPPORT) $(BUILD_PRINT) \
- 	    $(BUILD_ERRORS) $(BUILD_LIBS)
  
  genemit.o : genemit.c $(RTL_H) $(BCONFIG_H) $(SYSTEM_H) coretypes.h $(GTM_H) \
    errors.h gensupport.h
- 	$(CC_FOR_BUILD) -c $(BUILD_CFLAGS) $(BUILD_CPPFLAGS) $(INCLUDES) $(srcdir)/genemit.c $(OUTPUT_OPTION)
- 
- genopinit$(build_exeext) : genopinit.o $(BUILD_RTL) $(BUILD_SUPPORT) \
-   $(BUILD_PRINT) $(BUILD_ERRORS) $(BUILD_LIBDEPS)
- 	$(CC_FOR_BUILD) $(BUILD_CFLAGS) $(BUILD_LDFLAGS) -o $@ \
- 	 genopinit.o $(BUILD_RTL) $(BUILD_SUPPORT) $(BUILD_PRINT) \
- 	    $(BUILD_ERRORS) $(BUILD_LIBS)
  
  genopinit.o : genopinit.c $(RTL_H) $(BCONFIG_H) \
    $(SYSTEM_H) coretypes.h $(GTM_H) errors.h gensupport.h
- 	$(CC_FOR_BUILD) -c $(BUILD_CFLAGS) $(BUILD_CPPFLAGS) $(INCLUDES) $(srcdir)/genopinit.c $(OUTPUT_OPTION)
- 
- genrecog$(build_exeext) : genrecog.o $(BUILD_RTL) $(BUILD_SUPPORT) \
-     $(BUILD_PRINT) $(BUILD_ERRORS) $(BUILD_LIBDEPS)
- 	$(CC_FOR_BUILD) $(BUILD_CFLAGS) $(BUILD_LDFLAGS) -o $@ \
- 	 genrecog.o $(BUILD_RTL) $(BUILD_SUPPORT) $(BUILD_PRINT) \
- 	    $(BUILD_ERRORS) $(BUILD_LIBS)
  
  genrecog.o : genrecog.c $(RTL_H) $(BCONFIG_H) \
    $(SYSTEM_H) coretypes.h $(GTM_H) errors.h gensupport.h
- 	$(CC_FOR_BUILD) -c $(BUILD_CFLAGS) $(BUILD_CPPFLAGS) $(INCLUDES) $(srcdir)/genrecog.c $(OUTPUT_OPTION)
- 
- genextract$(build_exeext) : genextract.o $(BUILD_RTL) $(BUILD_SUPPORT) \
-   $(BUILD_PRINT) $(BUILD_ERRORS) $(BUILD_LIBDEPS)
- 	$(CC_FOR_BUILD) $(BUILD_CFLAGS) $(BUILD_LDFLAGS) -o $@ \
- 	 genextract.o $(BUILD_RTL) $(BUILD_SUPPORT) $(BUILD_PRINT) \
- 	    $(BUILD_ERRORS) $(BUILD_LIBS)
  
  genextract.o : genextract.c $(RTL_H) $(BCONFIG_H) \
    $(SYSTEM_H) coretypes.h $(GTM_H) insn-config.h errors.h gensupport.h
- 	$(CC_FOR_BUILD) -c $(BUILD_CFLAGS) $(BUILD_CPPFLAGS) $(INCLUDES) $(srcdir)/genextract.c $(OUTPUT_OPTION)
- 
- genpeep$(build_exeext) : genpeep.o $(BUILD_RTL) $(BUILD_SUPPORT) \
-   $(BUILD_PRINT) $(BUILD_ERRORS) $(BUILD_LIBDEPS)
- 	$(CC_FOR_BUILD) $(BUILD_CFLAGS) $(BUILD_LDFLAGS) -o $@ \
- 	 genpeep.o $(BUILD_RTL) $(BUILD_SUPPORT) $(BUILD_PRINT) \
- 	    $(BUILD_ERRORS) $(BUILD_LIBS)
  
  genpeep.o : genpeep.c $(RTL_H) $(BCONFIG_H) $(SYSTEM_H) coretypes.h $(GTM_H) \
    errors.h gensupport.h
- 	$(CC_FOR_BUILD) -c $(BUILD_CFLAGS) $(BUILD_CPPFLAGS) $(INCLUDES) $(srcdir)/genpeep.c $(OUTPUT_OPTION)
- 
- genattr$(build_exeext) : genattr.o $(BUILD_RTL) $(BUILD_SUPPORT) \
-   $(BUILD_PRINT) $(BUILD_ERRORS) $(BUILD_LIBDEPS)
- 	$(CC_FOR_BUILD) $(BUILD_CFLAGS) $(BUILD_LDFLAGS) -o $@ \
- 	 genattr.o $(BUILD_RTL) $(BUILD_SUPPORT) $(BUILD_PRINT) \
- 	    $(BUILD_ERRORS) $(BUILD_LIBS)
  
  genattr.o : genattr.c $(RTL_H) $(BCONFIG_H) $(SYSTEM_H) coretypes.h $(GTM_H) errors.h \
    gensupport.h
- 	$(CC_FOR_BUILD) -c $(BUILD_CFLAGS) $(BUILD_CPPFLAGS) $(INCLUDES) $(srcdir)/genattr.c $(OUTPUT_OPTION)
  
  genattrtab$(build_exeext) : genattrtab.o genautomata.o \
    $(BUILD_RTL) $(BUILD_SUPPORT) $(BUILD_PRINT) $(BUILD_ERRORS) $(BUILD_VARRAY) \
    $(BUILD_LIBDEPS)
  	$(CC_FOR_BUILD) $(BUILD_CFLAGS) $(BUILD_LDFLAGS) -o $@ \
--- 2074,2142 ----
  # $(CONFIG_H) is omitted from the deps of the gen*.o
  # because these programs don't really depend on anything
  # about the target machine.  They do depend on config.h itself,
  # since that describes the host machine.
  
+ genprogs=genconfig genflags gencodes genemit genopinit genrecog genextract \
+ 	 genpeep genattr genoutput
+ 
+ genobjs=$(genprogs:%=%.o) read-rtl.o gensupport.o genattrtab.o \
+         genautomata.o gengenrtl.o genpreds.o gengtype.o \
+ 	genconstants.o gen-protos.o scan.o fix-header.o scan-decls.o \
+ 	gencheck.o dummy-conditions.o genconditions.o
+ 
+ $(genprogs:%=%$(buildextext)): \
+ 	%$(build_exeext): %.o  $(BUILD_RTL) $(BUILD_SUPPORT) \
+ 		$(BUILD_PRINT) $(BUILD_ERRORS) $(BUILD_LIBDEPS)
+ 	$(CC_FOR_BUILD) $(BUILD_CFLAGS) $(BUILD_LDFLAGS) -o $@ \
+ 		$< $(BUILD_RTL) $(BUILD_SUPPORT) $(BUILD_PRINT) \
+ 		$(BUILD_ERRORS) $(BUILD_LIBS)
+ 
+ $(genobjs): %.o : %.c
+ 	$(CC_FOR_BUILD) -c $(BUILD_CFLAGS) $(BUILD_CPPFLAGS) $(INCLUDES) $< $(OUTPUT_OPTION)
+ 
  read-rtl.o: read-rtl.c $(BCONFIG_H) $(SYSTEM_H) coretypes.h $(GTM_H) $(RTL_H) \
    $(OBSTACK_H) $(HASHTAB_H)
  
  gensupport.o: gensupport.c $(BCONFIG_H) $(SYSTEM_H) coretypes.h $(GTM_H) $(RTL_H) \
    $(OBSTACK_H) errors.h $(HASHTAB_H) gensupport.h
  
  genconfig.o : genconfig.c $(RTL_H) $(BCONFIG_H) \
    $(SYSTEM_H) coretypes.h $(GTM_H) errors.h gensupport.h
  
  genflags.o : genflags.c $(RTL_H) $(OBSTACK_H) $(BCONFIG_H) \
    $(SYSTEM_H) coretypes.h $(GTM_H) errors.h gensupport.h
  
  gencodes.o : gencodes.c $(RTL_H) $(BCONFIG_H) \
    $(SYSTEM_H) coretypes.h $(GTM_H) errors.h gensupport.h
  
  genconstants$(build_exeext) : genconstants.o $(BUILD_RTL) $(BUILD_EARLY_SUPPORT) \
    $(BUILD_ERRORS) $(BUILD_LIBDEPS)
  	$(CC_FOR_BUILD) $(BUILD_CFLAGS) $(BUILD_LDFLAGS) -o $@ \
  	 genconstants.o $(BUILD_EARLY_SUPPORT) $(BUILD_RTL) \
  	    $(BUILD_ERRORS) $(BUILD_LIBS)
  
  genconstants.o : genconstants.c $(RTL_H) $(BCONFIG_H) $(SYSTEM_H) coretypes.h $(GTM_H) \
    errors.h
  
  genemit.o : genemit.c $(RTL_H) $(BCONFIG_H) $(SYSTEM_H) coretypes.h $(GTM_H) \
    errors.h gensupport.h
  
  genopinit.o : genopinit.c $(RTL_H) $(BCONFIG_H) \
    $(SYSTEM_H) coretypes.h $(GTM_H) errors.h gensupport.h
  
  genrecog.o : genrecog.c $(RTL_H) $(BCONFIG_H) \
    $(SYSTEM_H) coretypes.h $(GTM_H) errors.h gensupport.h
  
  genextract.o : genextract.c $(RTL_H) $(BCONFIG_H) \
    $(SYSTEM_H) coretypes.h $(GTM_H) insn-config.h errors.h gensupport.h
  
  genpeep.o : genpeep.c $(RTL_H) $(BCONFIG_H) $(SYSTEM_H) coretypes.h $(GTM_H) \
    errors.h gensupport.h
  
  genattr.o : genattr.c $(RTL_H) $(BCONFIG_H) $(SYSTEM_H) coretypes.h $(GTM_H) errors.h \
    gensupport.h
  
  genattrtab$(build_exeext) : genattrtab.o genautomata.o \
    $(BUILD_RTL) $(BUILD_SUPPORT) $(BUILD_PRINT) $(BUILD_ERRORS) $(BUILD_VARRAY) \
    $(BUILD_LIBDEPS)
  	$(CC_FOR_BUILD) $(BUILD_CFLAGS) $(BUILD_LDFLAGS) -o $@ \
*************** genattrtab$(build_exeext) : genattrtab.o
*** 2196,2245 ****
  	 $(BUILD_RTL) $(BUILD_SUPPORT) $(BUILD_PRINT) $(BUILD_ERRORS) \
  	 $(BUILD_VARRAY) $(BUILD_LIBS) -lm
  
  genattrtab.o : genattrtab.c $(RTL_H) $(OBSTACK_H) $(BCONFIG_H) \
    $(SYSTEM_H) coretypes.h $(GTM_H) errors.h $(GGC_H) gensupport.h genattrtab.h
- 	$(CC_FOR_BUILD) -c $(BUILD_CFLAGS) $(BUILD_CPPFLAGS) $(INCLUDES) $(srcdir)/genattrtab.c $(OUTPUT_OPTION)
  
  genautomata.o : genautomata.c $(RTL_H) $(OBSTACK_H) $(BCONFIG_H) \
    $(SYSTEM_H) coretypes.h $(GTM_H) errors.h varray.h genattrtab.h $(HASHTAB_H)
- 	$(CC_FOR_BUILD) -c $(BUILD_CFLAGS) $(BUILD_CPPFLAGS) $(INCLUDES) $(srcdir)/genautomata.c $(OUTPUT_OPTION)
- 
- genoutput$(build_exeext) : genoutput.o $(BUILD_RTL) $(BUILD_SUPPORT) \
-   $(BUILD_PRINT) $(BUILD_ERRORS) $(BUILD_LIBDEPS)
- 	$(CC_FOR_BUILD) $(BUILD_CFLAGS) $(BUILD_LDFLAGS) -o $@ \
- 	 genoutput.o $(BUILD_RTL) $(BUILD_SUPPORT) $(BUILD_PRINT) \
- 	    $(BUILD_ERRORS) $(BUILD_LIBS)
  
  genoutput.o : genoutput.c $(RTL_H) $(BCONFIG_H) \
    $(SYSTEM_H) coretypes.h $(GTM_H) errors.h gensupport.h
- 	$(CC_FOR_BUILD) -c $(BUILD_CFLAGS) $(BUILD_CPPFLAGS) $(INCLUDES) $(srcdir)/genoutput.c $(OUTPUT_OPTION)
  
  gengenrtl$(build_exeext) : gengenrtl.o $(BUILD_LIBDEPS)
  	$(CC_FOR_BUILD) $(BUILD_CFLAGS) $(BUILD_LDFLAGS) -o $@ \
  	 gengenrtl.o $(BUILD_LIBS)
  
  gengenrtl.o : gengenrtl.c $(RTL_BASE_H) $(BCONFIG_H) $(SYSTEM_H) coretypes.h \
    $(GTM_H) real.h
- 	$(CC_FOR_BUILD) -c $(BUILD_CFLAGS) $(BUILD_CPPFLAGS) $(INCLUDES) $(srcdir)/gengenrtl.c $(OUTPUT_OPTION)
  
  genpreds$(build_exeext) : genpreds.o $(BUILD_LIBDEPS)
  	$(CC_FOR_BUILD) $(BUILD_CFLAGS) $(BUILD_LDFLAGS) -o $@ \
  	 genpreds.o $(BUILD_LIBS)
  
  genpreds.o : genpreds.c $(RTL_BASE_H) $(BCONFIG_H) $(SYSTEM_H) coretypes.h $(GTM_H)
- 	$(CC_FOR_BUILD) -c $(BUILD_CFLAGS) $(BUILD_CPPFLAGS) $(INCLUDES) $(srcdir)/genpreds.c $(OUTPUT_OPTION)
  
  gengtype$(build_exeext) : gengtype.o gengtype-lex.o gengtype-yacc.o \
    $(BUILD_LIBDEPS)
  	$(CC_FOR_BUILD) $(BUILD_CFLAGS) $(BUILD_LDFLAGS) -o $@ \
  	 gengtype.o gengtype-lex.o gengtype-yacc.o $(BUILD_LIBS)
  
  gengtype.o : gengtype.c gengtype.h $(BCONFIG_H) $(SYSTEM_H) coretypes.h $(GTM_H) \
    real.h $(RTL_BASE_H) gtyp-gen.h
- 	$(CC_FOR_BUILD) -c $(BUILD_CFLAGS) $(BUILD_CPPFLAGS) $(INCLUDES) \
- 	  $(srcdir)/gengtype.c $(OUTPUT_OPTION)
  
  gengtype-lex.o : $(parsedir)/gengtype-lex.c gengtype.h $(parsedir)/gengtype-yacc.c \
    $(BCONFIG_H) coretypes.h $(GTM_H) $(SYSTEM_H)
  	$(CC_FOR_BUILD) -c $(BUILD_CFLAGS) $(BUILD_CPPFLAGS) $(INCLUDES) \
  	  $(parsedir)/gengtype-lex.c $(OUTPUT_OPTION)
--- 2144,2180 ----
*************** genconditions$(build_exeext) : gencondit
*** 2275,2286 ****
  	 genconditions.o $(BUILD_EARLY_SUPPORT) $(BUILD_RTL) \
  	    $(BUILD_ERRORS) $(BUILD_LIBS)
  
  genconditions.o : genconditions.c $(RTL_H) $(BCONFIG_H) $(SYSTEM_H) coretypes.h \
    $(GTM_H) errors.h
- 	$(CC_FOR_BUILD) -c $(BUILD_CFLAGS) $(BUILD_CPPFLAGS) $(INCLUDES) \
- 		$(srcdir)/genconditions.c $(OUTPUT_OPTION)
  
  #
  # Compile the libraries to be used by gen*.
  # If we are not cross-building, gen* use the same .o's that cc1 will use,
  # and BUILD_PREFIX_1 is `loser-', just to ensure these rules don't conflict
--- 2210,2219 ----
*************** GEN_PROTOS_OBJS = gen-protos.o scan.o
*** 2576,2589 ****
  gen-protos$(build_exeext): $(GEN_PROTOS_OBJS)
  	${CC_FOR_BUILD} $(BUILD_CFLAGS) $(BUILD_LDFLAGS) -o $@ \
  	  $(GEN_PROTOS_OBJS) $(BUILD_LIBS)
  
  gen-protos.o: gen-protos.c scan.h $(BCONFIG_H) $(SYSTEM_H) coretypes.h $(GTM_H)
- 	$(CC_FOR_BUILD) -c $(BUILD_CFLAGS) $(BUILD_CPPFLAGS) $(INCLUDES) $(srcdir)/gen-protos.c $(OUTPUT_OPTION)
  
  scan.o: scan.c scan.h $(BCONFIG_H) $(SYSTEM_H) coretypes.h $(GTM_H)
- 	$(CC_FOR_BUILD) -c $(BUILD_CFLAGS) $(BUILD_CPPFLAGS) $(INCLUDES) $(srcdir)/scan.c $(OUTPUT_OPTION)
  
  xsys-protos.h: $(GCC_PASSES) $(srcdir)/sys-protos.h deduced.h gen-protos$(build_exeext) Makefile
  	sed -e s/TARGET_GETGROUPS_T/$(TARGET_GETGROUPS_T)/ \
  	  deduced.h $(srcdir)/sys-protos.h > tmp-fixtmp.c
  	mv tmp-fixtmp.c fixtmp.c
--- 2509,2520 ----
*************** fix-header$(build_exeext): fix-header.o 
*** 2600,2613 ****
  	$(CC_FOR_BUILD) $(BUILD_CFLAGS) $(BUILD_LDFLAGS) -o $@ fix-header.o \
  	c-incpath.o cppdefault.o scan-decls.o prefix.o scan.o libcpp.a $(LIBS)
  
  fix-header.o: fix-header.c $(OBSTACK_H) scan.h \
  	xsys-protos.h $(BCONFIG_H) $(SYSTEM_H) coretypes.h $(GTM_H) $(CPPLIB_H)
- 	$(CC_FOR_BUILD) -c $(BUILD_CFLAGS) $(BUILD_CPPFLAGS) $(INCLUDES) $(srcdir)/fix-header.c $(OUTPUT_OPTION)
  
  scan-decls.o: scan-decls.c scan.h $(CPPLIB_H) $(BCONFIG_H) $(SYSTEM_H) coretypes.h $(GTM_H)
- 	$(CC_FOR_BUILD) -c $(BUILD_CFLAGS) $(BUILD_CPPFLAGS) $(INCLUDES) $(srcdir)/scan-decls.c $(OUTPUT_OPTION)
  
  # stmp-fixproto depends on this, not on fix-header directly.
  # The idea is to make sure fix-header gets built,
  # but not rerun fixproto after each stage
  # just because fix-header's mtime has changed.
--- 2531,2542 ----
*************** TESTSUITEDIR = testsuite
*** 3264,3312 ****
  $(TESTSUITEDIR)/site.exp: site.exp
  	test -d $(TESTSUITEDIR) || mkdir $(TESTSUITEDIR)
  	-rm -f $@
  	sed '/set tmpdir/ s|testsuite|$(TESTSUITEDIR)|' < site.exp > $@
  
! check-g++: $(TESTSUITEDIR)/site.exp
! 	-(rootme=`${PWD_COMMAND}`; export rootme; \
! 	srcdir=`cd ${srcdir}; ${PWD_COMMAND}` ; export srcdir ; \
! 	cd $(TESTSUITEDIR); \
! 	EXPECT=${EXPECT} ; export EXPECT ; \
! 	if [ -f $${rootme}/../expect/expect ] ; then  \
! 	   TCL_LIBRARY=`cd .. ; cd ${srcdir}/../tcl/library ; ${PWD_COMMAND}` ; \
! 	    export TCL_LIBRARY ; fi ; \
! 	$(RUNTEST) --tool g++ $(RUNTESTFLAGS))
! 
! check-gcc: $(TESTSUITEDIR)/site.exp
! 	-(rootme=`${PWD_COMMAND}`; export rootme; \
! 	srcdir=`cd ${srcdir}; ${PWD_COMMAND}` ; export srcdir ; \
! 	cd $(TESTSUITEDIR); \
! 	EXPECT=${EXPECT} ; export EXPECT ; \
! 	if [ -f $${rootme}/../expect/expect ] ; then  \
! 	   TCL_LIBRARY=`cd .. ; cd ${srcdir}/../tcl/library ; ${PWD_COMMAND}` ; \
! 	   export TCL_LIBRARY ; fi ; \
! 	$(RUNTEST) --tool gcc $(RUNTESTFLAGS))
! 
! check-g77: $(TESTSUITEDIR)/site.exp
! 	-(rootme=`${PWD_COMMAND}`; export rootme; \
! 	srcdir=`cd ${srcdir}; ${PWD_COMMAND}` ; export srcdir ; \
! 	cd $(TESTSUITEDIR); \
! 	EXPECT=${EXPECT} ; export EXPECT ; \
! 	if [ -f $${rootme}/../expect/expect ] ; then  \
! 	   TCL_LIBRARY=`cd .. ; cd ${srcdir}/../tcl/library ; ${PWD_COMMAND}` ; \
! 	   export TCL_LIBRARY ; fi ; \
! 	$(RUNTEST) --tool g77 $(RUNTESTFLAGS))
! 
! check-objc: $(TESTSUITEDIR)/site.exp
  	-(rootme=`${PWD_COMMAND}`; export rootme; \
  	srcdir=`cd ${srcdir}; ${PWD_COMMAND}` ; export srcdir ; \
  	cd $(TESTSUITEDIR); \
  	EXPECT=${EXPECT} ; export EXPECT ; \
  	if [ -f $${rootme}/../expect/expect ] ; then  \
  	   TCL_LIBRARY=`cd .. ; cd ${srcdir}/../tcl/library ; ${PWD_COMMAND}` ; \
  	    export TCL_LIBRARY ; fi ; \
! 	$(RUNTEST) --tool objc $(RUNTESTFLAGS))
  
  check-consistency: testsuite/site.exp
  	-rootme=`${PWD_COMMAND}`; export rootme; \
  	srcdir=`cd ${srcdir}; ${PWD_COMMAND}` ; export srcdir ; \
  	cd testsuite; \
--- 3193,3211 ----
  $(TESTSUITEDIR)/site.exp: site.exp
  	test -d $(TESTSUITEDIR) || mkdir $(TESTSUITEDIR)
  	-rm -f $@
  	sed '/set tmpdir/ s|testsuite|$(TESTSUITEDIR)|' < site.exp > $@
  
! check-g++ check-gcc check-g77 check-objc: check-% : $(TESTSUITEDIR)/site.exp
  	-(rootme=`${PWD_COMMAND}`; export rootme; \
  	srcdir=`cd ${srcdir}; ${PWD_COMMAND}` ; export srcdir ; \
  	cd $(TESTSUITEDIR); \
  	EXPECT=${EXPECT} ; export EXPECT ; \
  	if [ -f $${rootme}/../expect/expect ] ; then  \
  	   TCL_LIBRARY=`cd .. ; cd ${srcdir}/../tcl/library ; ${PWD_COMMAND}` ; \
  	    export TCL_LIBRARY ; fi ; \
! 	$(RUNTEST) --tool $* $(RUNTESTFLAGS))
  
  check-consistency: testsuite/site.exp
  	-rootme=`${PWD_COMMAND}`; export rootme; \
  	srcdir=`cd ${srcdir}; ${PWD_COMMAND}` ; export srcdir ; \
  	cd testsuite; \


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]