File libgc.patch of Package gcc33
Index: boehm-gc/Makefile.am =================================================================== RCS file: /cvs/gcc/gcc/boehm-gc/Makefile.am,v retrieving revision 1.36.2.2 diff -u -p -a -r1.36.2.2 Makefile.am --- boehm-gc/Makefile.am 24 Jan 2004 11:05:53 -0000 1.36.2.2 +++ boehm-gc/Makefile.am 30 Mar 2004 11:17:02 -0000 @@ -16,6 +16,7 @@ MULTISUBDIR = MULTIDO = true MULTICLEAN = true +toolexeclib_LTLIBRARIES = libgc.la noinst_LTLIBRARIES = libgcjgc.la libgcjgc_convenience.la if POWERPC_DARWIN @@ -38,13 +39,18 @@ mips_sgi_mach_dep.s mips_ultrix_mach_dep rs6000_mach_dep.s sparc_mach_dep.S sparc_netbsd_mach_dep.s \ sparc_sunos4_mach_dep.s ia64_save_regs_in_stack.s +libgc_la_SOURCES = $(GC_SOURCES) libgcjgc_la_SOURCES = $(GC_SOURCES) libgcjgc_convenience_la_SOURCES = $(GC_SOURCES) +EXTRA_libgc_la_SOURCES = $(GC_SOURCES) EXTRA_libgcjgc_la_SOURCES = $(EXTRA_GC_SOURCES) EXTRA_libgcjgc_convenience_la_SOURCES = $(EXTRA_GC_SOURCES) # Include THREADLIBS here to ensure that the correct versions of # linuxthread semaphore functions get linked: +libgc_la_LIBADD = @addobjs@ $(THREADLIBS) +libgc_la_DEPENDENCIES = @addobjs@ +libgc_la_LDFLAGS = -version-info 1:1:0 -rpath $(toolexeclibdir) libgcjgc_la_LIBADD = @addobjs@ $(THREADLIBS) libgcjgc_la_DEPENDENCIES = @addobjs@ libgcjgc_la_LDFLAGS = -version-info 1:1:0 -rpath $(toolexeclibdir) @@ -137,12 +143,12 @@ CONFIG_STATUS_DEPENDENCIES = $(srcdir)/c .PHONY: all-multi mostlyclean-multi clean-multi distclean-multi \ maintainer-clean-multi -all-am: all-multi -install-am: install-multi -mostlyclean-am: mostlyclean-multi -clean-am: clean-multi -distclean-am: distclean-multi -maintainer-clean-am: maintainer-clean-multi +all-recursive: all-multi +install-recursive: install-multi +mostlyclean-recursive: mostlyclean-multi +clean-recursive: clean-multi +distclean-recursive: distclean-multi +maintainer-clean-recursive: maintainer-clean-multi all-multi: : $(MAKE) ; exec $(MULTIDO) $(AM_MAKEFLAGS) DO=all multi-do Index: boehm-gc/Makefile.in =================================================================== RCS file: /cvs/gcc/gcc/boehm-gc/Makefile.in,v retrieving revision 1.40.2.3 diff -u -p -a -r1.40.2.3 Makefile.in --- boehm-gc/Makefile.in 24 Jan 2004 11:05:54 -0000 1.40.2.3 +++ boehm-gc/Makefile.in 30 Mar 2004 11:17:02 -0000 @@ -1,4 +1,4 @@ -# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am +# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am # Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation @@ -113,33 +113,29 @@ MULTISUBDIR = MULTIDO = true MULTICLEAN = true +toolexeclib_LTLIBRARIES = libgc.la noinst_LTLIBRARIES = libgcjgc.la libgcjgc_convenience.la -@POWERPC_DARWIN_TRUE@asm_libgc_sources = @POWERPC_DARWIN_TRUE@powerpc_darwin_mach_dep.s +@POWERPC_DARWIN_TRUE@asm_libgc_sources = powerpc_darwin_mach_dep.s @POWERPC_DARWIN_FALSE@asm_libgc_sources = -GC_SOURCES = allchblk.c alloc.c blacklst.c checksums.c dbg_mlc.c \ -dyn_load.c finalize.c gc_dlopen.c gcj_mlc.c headers.c aix_irix_threads.c \ -malloc.c mallocx.c mark.c mark_rts.c misc.c new_hblk.c \ -obj_map.c os_dep.c pcr_interface.c ptr_chck.c real_malloc.c reclaim.c \ -solaris_pthreads.c solaris_threads.c specific.c stubborn.c typd_mlc.c \ -backgraph.c win32_threads.c \ -pthread_support.c pthread_stop_world.c darwin_stop_world.c \ -$(asm_libgc_sources) +GC_SOURCES = allchblk.c alloc.c blacklst.c checksums.c dbg_mlc.c dyn_load.c finalize.c gc_dlopen.c gcj_mlc.c headers.c aix_irix_threads.c malloc.c mallocx.c mark.c mark_rts.c misc.c new_hblk.c obj_map.c os_dep.c pcr_interface.c ptr_chck.c real_malloc.c reclaim.c solaris_pthreads.c solaris_threads.c specific.c stubborn.c typd_mlc.c backgraph.c win32_threads.c pthread_support.c pthread_stop_world.c darwin_stop_world.c $(asm_libgc_sources) -EXTRA_GC_SOURCES = alpha_mach_dep.S \ -mips_sgi_mach_dep.s mips_ultrix_mach_dep.s powerpc_darwin_mach_dep.s \ -rs6000_mach_dep.s sparc_mach_dep.S sparc_netbsd_mach_dep.s \ -sparc_sunos4_mach_dep.s ia64_save_regs_in_stack.s +EXTRA_GC_SOURCES = alpha_mach_dep.S mips_sgi_mach_dep.s mips_ultrix_mach_dep.s powerpc_darwin_mach_dep.s rs6000_mach_dep.s sparc_mach_dep.S sparc_netbsd_mach_dep.s sparc_sunos4_mach_dep.s ia64_save_regs_in_stack.s +libgc_la_SOURCES = $(GC_SOURCES) libgcjgc_la_SOURCES = $(GC_SOURCES) libgcjgc_convenience_la_SOURCES = $(GC_SOURCES) +EXTRA_libgc_la_SOURCES = $(GC_SOURCES) EXTRA_libgcjgc_la_SOURCES = $(EXTRA_GC_SOURCES) EXTRA_libgcjgc_convenience_la_SOURCES = $(EXTRA_GC_SOURCES) # Include THREADLIBS here to ensure that the correct versions of # linuxthread semaphore functions get linked: +libgc_la_LIBADD = @addobjs@ $(THREADLIBS) +libgc_la_DEPENDENCIES = @addobjs@ +libgc_la_LDFLAGS = -version-info 1:1:0 -rpath $(toolexeclibdir) libgcjgc_la_LIBADD = @addobjs@ $(THREADLIBS) libgcjgc_la_DEPENDENCIES = @addobjs@ libgcjgc_la_LDFLAGS = -version-info 1:1:0 -rpath $(toolexeclibdir) @@ -162,52 +158,14 @@ TESTS = gctest all_objs = @addobjs@ $(libgcjgc_la_OBJECTS) -LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) \ - $(AM_CFLAGS) $(MY_CFLAGS) $(GC_CFLAGS) +LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(MY_CFLAGS) $(GC_CFLAGS) LINK = $(LIBTOOL) --mode=link $(CC) $(AM_CFLAGS) $(MY_CFLAGS) $(LDFLAGS) -o $@ # Work around what appears to be a GNU make bug handling MAKEFLAGS # values defined in terms of make variables, as is the case for CC and # friends when we are called from the top level Makefile. -AM_MAKEFLAGS = \ - "AR_FLAGS=$(AR_FLAGS)" \ - "CC_FOR_BUILD=$(CC_FOR_BUILD)" \ - "CFLAGS=$(CFLAGS)" \ - "CXXFLAGS=$(CXXFLAGS)" \ - "CFLAGS_FOR_BUILD=$(CFLAGS_FOR_BUILD)" \ - "CFLAGS_FOR_TARGET=$(CFLAGS_FOR_TARGET)" \ - "INSTALL=$(INSTALL)" \ - "INSTALL_DATA=$(INSTALL_DATA)" \ - "INSTALL_PROGRAM=$(INSTALL_PROGRAM)" \ - "INSTALL_SCRIPT=$(INSTALL_SCRIPT)" \ - "LDFLAGS=$(LDFLAGS)" \ - "LIBCFLAGS=$(LIBCFLAGS)" \ - "LIBCFLAGS_FOR_TARGET=$(LIBCFLAGS_FOR_TARGET)" \ - "MAKE=$(MAKE)" \ - "MAKEINFO=$(MAKEINFO) $(MAKEINFOFLAGS)" \ - "PICFLAG=$(PICFLAG)" \ - "PICFLAG_FOR_TARGET=$(PICFLAG_FOR_TARGET)" \ - "SHELL=$(SHELL)" \ - "EXPECT=$(EXPECT)" \ - "RUNTEST=$(RUNTEST)" \ - "RUNTESTFLAGS=$(RUNTESTFLAGS)" \ - "exec_prefix=$(exec_prefix)" \ - "infodir=$(infodir)" \ - "libdir=$(libdir)" \ - "prefix=$(prefix)" \ - "tooldir=$(tooldir)" \ - "AR=$(AR)" \ - "AS=$(AS)" \ - "CC=$(CC)" \ - "CXX=$(CXX)" \ - "LD=$(LD)" \ - "LIBCFLAGS=$(LIBCFLAGS)" \ - "NM=$(NM)" \ - "PICFLAG=$(PICFLAG)" \ - "RANLIB=$(RANLIB)" \ - "DESTDIR=$(DESTDIR)" +AM_MAKEFLAGS = "AR_FLAGS=$(AR_FLAGS)" "CC_FOR_BUILD=$(CC_FOR_BUILD)" "CFLAGS=$(CFLAGS)" "CXXFLAGS=$(CXXFLAGS)" "CFLAGS_FOR_BUILD=$(CFLAGS_FOR_BUILD)" "CFLAGS_FOR_TARGET=$(CFLAGS_FOR_TARGET)" "INSTALL=$(INSTALL)" "INSTALL_DATA=$(INSTALL_DATA)" "INSTALL_PROGRAM=$(INSTALL_PROGRAM)" "INSTALL_SCRIPT=$(INSTALL_SCRIPT)" "LDFLAGS=$(LDFLAGS)" "LIBCFLAGS=$(LIBCFLAGS)" "LIBCFLAGS_FOR_TARGET=$(LIBCFLAGS_FOR_TARGET)" "MAKE=$(MAKE)" "MAKEINFO=$(MAKEINFO) $(MAKEINFOFLAGS)" "PICFLAG=$(PICFLAG)" "PICFLAG_FOR_TARGET=$(PICFLAG_FOR_TARGET)" "SHELL=$(SHELL)" "EXPECT=$(EXPECT)" "RUNTEST=$(RUNTEST)" "RUNTESTFLAGS=$(RUNTESTFLAGS)" "exec_prefix=$(exec_prefix)" "infodir=$(infodir)" "libdir=$(libdir)" "prefix=$(prefix)" "tooldir=$(tooldir)" "AR=$(AR)" "AS=$(AS)" "CC=$(CC)" "CXX=$(CXX)" "LD=$(LD)" "LIBCFLAGS=$(LIBCFLAGS)" "NM=$(NM)" "PICFLAG=$(PICFLAG)" "RANLIB=$(RANLIB)" "DESTDIR=$(DESTDIR)" CONFIG_STATUS_DEPENDENCIES = $(srcdir)/configure.host @@ -215,13 +173,24 @@ CONFIG_STATUS_DEPENDENCIES = $(srcdir)/c MAKEOVERRIDES = ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 CONFIG_CLEAN_FILES = -LTLIBRARIES = $(noinst_LTLIBRARIES) +LTLIBRARIES = $(noinst_LTLIBRARIES) $(toolexeclib_LTLIBRARIES) DEFS = @DEFS@ -I. -I$(srcdir) CPPFLAGS = @CPPFLAGS@ LDFLAGS = @LDFLAGS@ LIBS = @LIBS@ +@POWERPC_DARWIN_TRUE@libgcjgc_la_OBJECTS = allchblk.lo alloc.lo \ +@POWERPC_DARWIN_TRUE@blacklst.lo checksums.lo dbg_mlc.lo dyn_load.lo \ +@POWERPC_DARWIN_TRUE@finalize.lo gc_dlopen.lo gcj_mlc.lo headers.lo \ +@POWERPC_DARWIN_TRUE@aix_irix_threads.lo malloc.lo mallocx.lo mark.lo \ +@POWERPC_DARWIN_TRUE@mark_rts.lo misc.lo new_hblk.lo obj_map.lo \ +@POWERPC_DARWIN_TRUE@os_dep.lo pcr_interface.lo ptr_chck.lo \ +@POWERPC_DARWIN_TRUE@real_malloc.lo reclaim.lo solaris_pthreads.lo \ +@POWERPC_DARWIN_TRUE@solaris_threads.lo specific.lo stubborn.lo \ +@POWERPC_DARWIN_TRUE@typd_mlc.lo backgraph.lo win32_threads.lo \ +@POWERPC_DARWIN_TRUE@pthread_support.lo pthread_stop_world.lo \ +@POWERPC_DARWIN_TRUE@darwin_stop_world.lo powerpc_darwin_mach_dep.lo @POWERPC_DARWIN_FALSE@libgcjgc_la_OBJECTS = allchblk.lo alloc.lo \ @POWERPC_DARWIN_FALSE@blacklst.lo checksums.lo dbg_mlc.lo dyn_load.lo \ @POWERPC_DARWIN_FALSE@finalize.lo gc_dlopen.lo gcj_mlc.lo headers.lo \ @@ -233,18 +202,18 @@ LIBS = @LIBS@ @POWERPC_DARWIN_FALSE@typd_mlc.lo backgraph.lo win32_threads.lo \ @POWERPC_DARWIN_FALSE@pthread_support.lo pthread_stop_world.lo \ @POWERPC_DARWIN_FALSE@darwin_stop_world.lo -@POWERPC_DARWIN_TRUE@libgcjgc_la_OBJECTS = allchblk.lo alloc.lo \ -@POWERPC_DARWIN_TRUE@blacklst.lo checksums.lo dbg_mlc.lo dyn_load.lo \ -@POWERPC_DARWIN_TRUE@finalize.lo gc_dlopen.lo gcj_mlc.lo headers.lo \ -@POWERPC_DARWIN_TRUE@aix_irix_threads.lo malloc.lo mallocx.lo mark.lo \ -@POWERPC_DARWIN_TRUE@mark_rts.lo misc.lo new_hblk.lo obj_map.lo \ -@POWERPC_DARWIN_TRUE@os_dep.lo pcr_interface.lo ptr_chck.lo \ +libgcjgc_convenience_la_LDFLAGS = +@POWERPC_DARWIN_TRUE@libgcjgc_convenience_la_OBJECTS = allchblk.lo \ +@POWERPC_DARWIN_TRUE@alloc.lo blacklst.lo checksums.lo dbg_mlc.lo \ +@POWERPC_DARWIN_TRUE@dyn_load.lo finalize.lo gc_dlopen.lo gcj_mlc.lo \ +@POWERPC_DARWIN_TRUE@headers.lo aix_irix_threads.lo malloc.lo \ +@POWERPC_DARWIN_TRUE@mallocx.lo mark.lo mark_rts.lo misc.lo new_hblk.lo \ +@POWERPC_DARWIN_TRUE@obj_map.lo os_dep.lo pcr_interface.lo ptr_chck.lo \ @POWERPC_DARWIN_TRUE@real_malloc.lo reclaim.lo solaris_pthreads.lo \ @POWERPC_DARWIN_TRUE@solaris_threads.lo specific.lo stubborn.lo \ @POWERPC_DARWIN_TRUE@typd_mlc.lo backgraph.lo win32_threads.lo \ @POWERPC_DARWIN_TRUE@pthread_support.lo pthread_stop_world.lo \ @POWERPC_DARWIN_TRUE@darwin_stop_world.lo powerpc_darwin_mach_dep.lo -libgcjgc_convenience_la_LDFLAGS = @POWERPC_DARWIN_FALSE@libgcjgc_convenience_la_OBJECTS = allchblk.lo \ @POWERPC_DARWIN_FALSE@alloc.lo blacklst.lo checksums.lo dbg_mlc.lo \ @POWERPC_DARWIN_FALSE@dyn_load.lo finalize.lo gc_dlopen.lo gcj_mlc.lo \ @@ -256,32 +225,43 @@ libgcjgc_convenience_la_LDFLAGS = @POWERPC_DARWIN_FALSE@specific.lo stubborn.lo typd_mlc.lo backgraph.lo \ @POWERPC_DARWIN_FALSE@win32_threads.lo pthread_support.lo \ @POWERPC_DARWIN_FALSE@pthread_stop_world.lo darwin_stop_world.lo -@POWERPC_DARWIN_TRUE@libgcjgc_convenience_la_OBJECTS = allchblk.lo \ -@POWERPC_DARWIN_TRUE@alloc.lo blacklst.lo checksums.lo dbg_mlc.lo \ -@POWERPC_DARWIN_TRUE@dyn_load.lo finalize.lo gc_dlopen.lo gcj_mlc.lo \ -@POWERPC_DARWIN_TRUE@headers.lo aix_irix_threads.lo malloc.lo \ -@POWERPC_DARWIN_TRUE@mallocx.lo mark.lo mark_rts.lo misc.lo new_hblk.lo \ -@POWERPC_DARWIN_TRUE@obj_map.lo os_dep.lo pcr_interface.lo ptr_chck.lo \ +@POWERPC_DARWIN_TRUE@libgc_la_OBJECTS = allchblk.lo alloc.lo \ +@POWERPC_DARWIN_TRUE@blacklst.lo checksums.lo dbg_mlc.lo dyn_load.lo \ +@POWERPC_DARWIN_TRUE@finalize.lo gc_dlopen.lo gcj_mlc.lo headers.lo \ +@POWERPC_DARWIN_TRUE@aix_irix_threads.lo malloc.lo mallocx.lo mark.lo \ +@POWERPC_DARWIN_TRUE@mark_rts.lo misc.lo new_hblk.lo obj_map.lo \ +@POWERPC_DARWIN_TRUE@os_dep.lo pcr_interface.lo ptr_chck.lo \ @POWERPC_DARWIN_TRUE@real_malloc.lo reclaim.lo solaris_pthreads.lo \ @POWERPC_DARWIN_TRUE@solaris_threads.lo specific.lo stubborn.lo \ @POWERPC_DARWIN_TRUE@typd_mlc.lo backgraph.lo win32_threads.lo \ @POWERPC_DARWIN_TRUE@pthread_support.lo pthread_stop_world.lo \ @POWERPC_DARWIN_TRUE@darwin_stop_world.lo powerpc_darwin_mach_dep.lo +@POWERPC_DARWIN_FALSE@libgc_la_OBJECTS = allchblk.lo alloc.lo \ +@POWERPC_DARWIN_FALSE@blacklst.lo checksums.lo dbg_mlc.lo dyn_load.lo \ +@POWERPC_DARWIN_FALSE@finalize.lo gc_dlopen.lo gcj_mlc.lo headers.lo \ +@POWERPC_DARWIN_FALSE@aix_irix_threads.lo malloc.lo mallocx.lo mark.lo \ +@POWERPC_DARWIN_FALSE@mark_rts.lo misc.lo new_hblk.lo obj_map.lo \ +@POWERPC_DARWIN_FALSE@os_dep.lo pcr_interface.lo ptr_chck.lo \ +@POWERPC_DARWIN_FALSE@real_malloc.lo reclaim.lo solaris_pthreads.lo \ +@POWERPC_DARWIN_FALSE@solaris_threads.lo specific.lo stubborn.lo \ +@POWERPC_DARWIN_FALSE@typd_mlc.lo backgraph.lo win32_threads.lo \ +@POWERPC_DARWIN_FALSE@pthread_support.lo pthread_stop_world.lo \ +@POWERPC_DARWIN_FALSE@darwin_stop_world.lo check_PROGRAMS = gctest$(EXEEXT) gctest_DEPENDENCIES = ./libgcjgc.la COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) CCLD = $(CC) DIST_COMMON = ChangeLog Makefile.am Makefile.in acinclude.m4 aclocal.m4 \ config.guess config.sub configure configure.in install-sh ltconfig \ -ltmain.sh mkinstalldirs +ltmain.sh missing mkinstalldirs DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) -TAR = gtar +TAR = tar GZIP_ENV = --best -SOURCES = $(libgcjgc_la_SOURCES) $(EXTRA_libgcjgc_la_SOURCES) $(libgcjgc_convenience_la_SOURCES) $(EXTRA_libgcjgc_convenience_la_SOURCES) -OBJECTS = $(libgcjgc_la_OBJECTS) $(libgcjgc_convenience_la_OBJECTS) +SOURCES = $(libgcjgc_la_SOURCES) $(EXTRA_libgcjgc_la_SOURCES) $(libgcjgc_convenience_la_SOURCES) $(EXTRA_libgcjgc_convenience_la_SOURCES) $(libgc_la_SOURCES) $(EXTRA_libgc_la_SOURCES) +OBJECTS = $(libgcjgc_la_OBJECTS) $(libgcjgc_convenience_la_OBJECTS) $(libgc_la_OBJECTS) all: all-redirect .SUFFIXES: @@ -310,6 +290,31 @@ distclean-noinstLTLIBRARIES: maintainer-clean-noinstLTLIBRARIES: +mostlyclean-toolexeclibLTLIBRARIES: + +clean-toolexeclibLTLIBRARIES: + -test -z "$(toolexeclib_LTLIBRARIES)" || rm -f $(toolexeclib_LTLIBRARIES) + +distclean-toolexeclibLTLIBRARIES: + +maintainer-clean-toolexeclibLTLIBRARIES: + +install-toolexeclibLTLIBRARIES: $(toolexeclib_LTLIBRARIES) + @$(NORMAL_INSTALL) + $(mkinstalldirs) $(DESTDIR)$(toolexeclibdir) + @list='$(toolexeclib_LTLIBRARIES)'; for p in $$list; do \ + if test -f $$p; then \ + echo "$(LIBTOOL) --mode=install $(INSTALL) $$p $(DESTDIR)$(toolexeclibdir)/$$p"; \ + $(LIBTOOL) --mode=install $(INSTALL) $$p $(DESTDIR)$(toolexeclibdir)/$$p; \ + else :; fi; \ + done + +uninstall-toolexeclibLTLIBRARIES: + @$(NORMAL_UNINSTALL) + list='$(toolexeclib_LTLIBRARIES)'; for p in $$list; do \ + $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(toolexeclibdir)/$$p; \ + done + .c.o: $(COMPILE) -c $< @@ -357,6 +362,9 @@ libgcjgc.la: $(libgcjgc_la_OBJECTS) $(li libgcjgc_convenience.la: $(libgcjgc_convenience_la_OBJECTS) $(libgcjgc_convenience_la_DEPENDENCIES) $(LINK) $(libgcjgc_convenience_la_LDFLAGS) $(libgcjgc_convenience_la_OBJECTS) $(libgcjgc_convenience_la_LIBADD) $(LIBS) +libgc.la: $(libgc_la_OBJECTS) $(libgc_la_DEPENDENCIES) + $(LINK) -rpath $(toolexeclibdir) $(libgc_la_LDFLAGS) $(libgc_la_OBJECTS) $(libgc_la_LIBADD) $(LIBS) + mostlyclean-checkPROGRAMS: clean-checkPROGRAMS: @@ -553,7 +561,7 @@ installcheck-am: installcheck: installcheck-recursive install-info-am: install-info: install-info-recursive -install-exec-am: +install-exec-am: install-toolexeclibLTLIBRARIES install-exec: install-exec-recursive install-data-am: @@ -562,7 +570,7 @@ install-data: install-data-recursive install-am: all-am @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am install: install-recursive -uninstall-am: +uninstall-am: uninstall-toolexeclibLTLIBRARIES uninstall: uninstall-recursive all-am: Makefile $(LTLIBRARIES) all-redirect: all-recursive @@ -570,6 +578,7 @@ install-strip: $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install installdirs: installdirs-recursive installdirs-am: + $(mkinstalldirs) $(DESTDIR)$(toolexeclibdir) mostlyclean-generic: @@ -581,19 +590,21 @@ distclean-generic: -rm -f config.cache config.log stamp-h stamp-h[0-9]* maintainer-clean-generic: -mostlyclean-am: mostlyclean-noinstLTLIBRARIES mostlyclean-compile \ +mostlyclean-am: mostlyclean-noinstLTLIBRARIES \ + mostlyclean-toolexeclibLTLIBRARIES mostlyclean-compile \ mostlyclean-libtool mostlyclean-checkPROGRAMS \ mostlyclean-tags mostlyclean-generic mostlyclean: mostlyclean-recursive -clean-am: clean-noinstLTLIBRARIES clean-compile clean-libtool \ - clean-checkPROGRAMS clean-tags clean-generic \ - mostlyclean-am +clean-am: clean-noinstLTLIBRARIES clean-toolexeclibLTLIBRARIES \ + clean-compile clean-libtool clean-checkPROGRAMS \ + clean-tags clean-generic mostlyclean-am clean: clean-recursive -distclean-am: distclean-noinstLTLIBRARIES distclean-compile \ +distclean-am: distclean-noinstLTLIBRARIES \ + distclean-toolexeclibLTLIBRARIES distclean-compile \ distclean-libtool distclean-checkPROGRAMS \ distclean-tags distclean-generic clean-am -rm -f libtool @@ -602,6 +613,7 @@ distclean: distclean-recursive -rm -f config.status maintainer-clean-am: maintainer-clean-noinstLTLIBRARIES \ + maintainer-clean-toolexeclibLTLIBRARIES \ maintainer-clean-compile maintainer-clean-libtool \ maintainer-clean-checkPROGRAMS maintainer-clean-tags \ maintainer-clean-generic distclean-am @@ -613,6 +625,9 @@ maintainer-clean: maintainer-clean-recur .PHONY: mostlyclean-noinstLTLIBRARIES distclean-noinstLTLIBRARIES \ clean-noinstLTLIBRARIES maintainer-clean-noinstLTLIBRARIES \ +mostlyclean-toolexeclibLTLIBRARIES distclean-toolexeclibLTLIBRARIES \ +clean-toolexeclibLTLIBRARIES maintainer-clean-toolexeclibLTLIBRARIES \ +uninstall-toolexeclibLTLIBRARIES install-toolexeclibLTLIBRARIES \ mostlyclean-compile distclean-compile clean-compile \ maintainer-clean-compile mostlyclean-libtool distclean-libtool \ clean-libtool maintainer-clean-libtool mostlyclean-checkPROGRAMS \ @@ -647,12 +662,12 @@ include/gc_mark.h @addincludes@ .PHONY: all-multi mostlyclean-multi clean-multi distclean-multi \ maintainer-clean-multi -all-am: all-multi -install-am: install-multi -mostlyclean-am: mostlyclean-multi -clean-am: clean-multi -distclean-am: distclean-multi -maintainer-clean-am: maintainer-clean-multi +all-recursive: all-multi +install-recursive: install-multi +mostlyclean-recursive: mostlyclean-multi +clean-recursive: clean-multi +distclean-recursive: distclean-multi +maintainer-clean-recursive: maintainer-clean-multi all-multi: : $(MAKE) ; exec $(MULTIDO) $(AM_MAKEFLAGS) DO=all multi-do Index: boehm-gc/include/Makefile.am =================================================================== RCS file: /cvs/gcc/gcc/boehm-gc/include/Makefile.am,v retrieving revision 1.1.40.1 diff -u -p -a -r1.1.40.1 Makefile.am --- boehm-gc/include/Makefile.am 12 Jan 2003 14:24:07 -0000 1.1.40.1 +++ boehm-gc/include/Makefile.am 30 Mar 2004 11:17:02 -0000 @@ -1,6 +1,6 @@ AUTOMAKE_OPTIONS = foreign -noinst_HEADERS = gc.h gc_backptr.h gc_local_alloc.h \ +include_HEADERS = gc.h gc_backptr.h gc_config_macros.h gc_local_alloc.h \ gc_pthread_redirects.h gc_cpp.h Index: boehm-gc/include/Makefile.in =================================================================== RCS file: /cvs/gcc/gcc/boehm-gc/include/Makefile.in,v retrieving revision 1.3.30.2 diff -u -p -a -r1.3.30.2 Makefile.in --- boehm-gc/include/Makefile.in 24 Jan 2004 11:05:56 -0000 1.3.30.2 +++ boehm-gc/include/Makefile.in 30 Mar 2004 11:17:02 -0000 @@ -1,4 +1,4 @@ -# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am +# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am # Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation @@ -103,29 +103,43 @@ toolexeclibdir = @toolexeclibdir@ AUTOMAKE_OPTIONS = foreign -noinst_HEADERS = gc.h gc_backptr.h gc_local_alloc.h \ - gc_pthread_redirects.h gc_cpp.h +include_HEADERS = gc.h gc_backptr.h gc_config_macros.h gc_local_alloc.h gc_pthread_redirects.h gc_cpp.h CONFIG_CLEAN_FILES = -HEADERS = $(noinst_HEADERS) +HEADERS = $(include_HEADERS) DIST_COMMON = Makefile.am Makefile.in DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) -TAR = gtar +TAR = tar GZIP_ENV = --best all: all-redirect .SUFFIXES: $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) - cd $(top_srcdir) && $(AUTOMAKE) --cygnus include/Makefile + cd $(top_srcdir) && $(AUTOMAKE) --foreign include/Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES) cd $(top_builddir) \ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status +install-includeHEADERS: $(include_HEADERS) + @$(NORMAL_INSTALL) + $(mkinstalldirs) $(DESTDIR)$(includedir) + @list='$(include_HEADERS)'; for p in $$list; do \ + if test -f "$$p"; then d= ; else d="$(srcdir)/"; fi; \ + echo " $(INSTALL_DATA) $$d$$p $(DESTDIR)$(includedir)/$$p"; \ + $(INSTALL_DATA) $$d$$p $(DESTDIR)$(includedir)/$$p; \ + done + +uninstall-includeHEADERS: + @$(NORMAL_UNINSTALL) + list='$(include_HEADERS)'; for p in $$list; do \ + rm -f $(DESTDIR)$(includedir)/$$p; \ + done + tags: TAGS ID: $(HEADERS) $(SOURCES) $(LISP) @@ -160,8 +174,13 @@ distdir = $(top_builddir)/$(PACKAGE)-$(V subdir = include distdir: $(DISTFILES) + here=`cd $(top_builddir) && pwd`; \ + top_distdir=`cd $(top_distdir) && pwd`; \ + distdir=`cd $(distdir) && pwd`; \ + cd $(top_srcdir) \ + && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --foreign include/Makefile @for file in $(DISTFILES); do \ - if test -f $$file; then d=.; else d=$(srcdir); fi; \ + d=$(srcdir); \ if test -d $$d/$$file; then \ cp -pr $$d/$$file $(distdir)/$$file; \ else \ @@ -174,28 +193,27 @@ info-am: info: info-am dvi-am: dvi: dvi-am -check-am: +check-am: all-am check: check-am installcheck-am: installcheck: installcheck-am -install-info-am: -install-info: install-info-am install-exec-am: install-exec: install-exec-am -install-data-am: +install-data-am: install-includeHEADERS install-data: install-data-am install-am: all-am @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am install: install-am -uninstall-am: +uninstall-am: uninstall-includeHEADERS uninstall: uninstall-am all-am: Makefile $(HEADERS) all-redirect: all-am install-strip: $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install installdirs: + $(mkinstalldirs) $(DESTDIR)$(includedir) mostlyclean-generic: @@ -227,12 +245,12 @@ maintainer-clean-am: maintainer-clean-t maintainer-clean: maintainer-clean-am -.PHONY: tags mostlyclean-tags distclean-tags clean-tags \ -maintainer-clean-tags distdir info-am info dvi-am dvi check check-am \ -installcheck-am installcheck install-info-am install-info \ -install-exec-am install-exec install-data-am install-data install-am \ -install uninstall-am uninstall all-redirect all-am all installdirs \ -mostlyclean-generic distclean-generic clean-generic \ +.PHONY: uninstall-includeHEADERS install-includeHEADERS tags \ +mostlyclean-tags distclean-tags clean-tags maintainer-clean-tags \ +distdir info-am info dvi-am dvi check check-am installcheck-am \ +installcheck install-exec-am install-exec install-data-am install-data \ +install-am install uninstall-am uninstall all-redirect all-am all \ +installdirs mostlyclean-generic distclean-generic clean-generic \ maintainer-clean-generic clean mostlyclean distclean maintainer-clean
