diff options
| author | Guillem Jover <guillem@debian.org> | 2007-08-08 22:16:47 +0000 |
|---|---|---|
| committer | Guillem Jover <guillem@debian.org> | 2007-08-08 22:16:47 +0000 |
| commit | 497c8fa216dc86adf37e35132faecf0978ecef60 (patch) | |
| tree | 581a244f78e7c6586d379a696480c074123cb8a4 /debian/patches/90_autoconf_autogen.patch | |
| parent | da949470bc0ef1c3df5e468e3d65d8debeb67bda (diff) | |
New upstream CVS snapshot.
Diffstat (limited to 'debian/patches/90_autoconf_autogen.patch')
| -rw-r--r-- | debian/patches/90_autoconf_autogen.patch | 185 |
1 files changed, 96 insertions, 89 deletions
diff --git a/debian/patches/90_autoconf_autogen.patch b/debian/patches/90_autoconf_autogen.patch index 6c75d1b..0295640 100644 --- a/debian/patches/90_autoconf_autogen.patch +++ b/debian/patches/90_autoconf_autogen.patch @@ -5,8 +5,10 @@ Regenerate with: find -name autom4te.cache -o -name '*~' | xargs rm -rf ---- config.h.in 2007-05-26 09:04:36.000000000 +0300 -+++ config.h.in 2007-05-26 09:56:30.000000000 +0300 +Index: b/config.h.in +=================================================================== +--- a/config.h.in 2007-08-09 00:48:38.000000000 +0300 ++++ b/config.h.in 2007-08-09 01:13:18.000000000 +0300 @@ -45,6 +45,9 @@ default and for qemu */ #undef CONFIG_BLK_DEV_FD @@ -28,8 +30,10 @@ Regenerate with: /* option sk_g16: Linux device driver for Ethernet controller Schneider & Koch G16; on ix86-at enabled by default */ #undef CONFIG_SK_G16 ---- configure 2007-05-26 09:04:32.000000000 +0300 -+++ configure 2007-05-26 09:56:26.000000000 +0300 +Index: b/configure +=================================================================== +--- a/configure 2007-08-09 00:48:32.000000000 +0300 ++++ b/configure 2007-08-09 01:13:14.000000000 +0300 @@ -821,6 +821,8 @@ device_driver_rtl8139_TRUE device_driver_rtl8139_FALSE device_driver_seeq8005_TRUE @@ -56,7 +60,7 @@ Regenerate with: --enable-sk_g16 Linux device driver for Ethernet controller Schneider & Koch G16; on ix86-at enabled by default --enable-smc-ultra Linux device driver for Ethernet controller SMC -@@ -6442,6 +6447,17 @@ _ACEOF +@@ -6450,6 +6455,17 @@ _ACEOF fi @@ -74,7 +78,7 @@ Regenerate with: -@@ -9526,6 +9542,52 @@ fi +@@ -9534,6 +9550,52 @@ fi unset enableval @@ -127,7 +131,7 @@ Regenerate with: # Check whether --enable-sk_g16 was given. if test "${enable_sk_g16+set}" = set; then enableval=$enable_sk_g16; -@@ -11630,6 +11692,13 @@ echo "$as_me: error: conditional \"devic +@@ -11645,6 +11707,13 @@ echo "$as_me: error: conditional \"devic Usually this means the macro was only invoked conditionally." >&2;} { (exit 1); exit 1; }; } fi @@ -141,7 +145,7 @@ Regenerate with: if test -z "${device_driver_sk_g16_TRUE}" && test -z "${device_driver_sk_g16_FALSE}"; then { { echo "$as_me:$LINENO: error: conditional \"device_driver_sk_g16\" was never defined. Usually this means the macro was only invoked conditionally." >&5 -@@ -12735,6 +12804,8 @@ device_driver_rtl8139_TRUE!$device_drive +@@ -12750,6 +12819,8 @@ device_driver_rtl8139_TRUE!$device_drive device_driver_rtl8139_FALSE!$device_driver_rtl8139_FALSE$ac_delim device_driver_seeq8005_TRUE!$device_driver_seeq8005_TRUE$ac_delim device_driver_seeq8005_FALSE!$device_driver_seeq8005_FALSE$ac_delim @@ -150,7 +154,7 @@ Regenerate with: device_driver_sk_g16_TRUE!$device_driver_sk_g16_TRUE$ac_delim device_driver_sk_g16_FALSE!$device_driver_sk_g16_FALSE$ac_delim device_driver_smc_ultra_TRUE!$device_driver_smc_ultra_TRUE$ac_delim -@@ -12782,8 +12853,6 @@ device_driver_smc91c92_cs_FALSE!$device_ +@@ -12797,8 +12868,6 @@ device_driver_smc91c92_cs_FALSE!$device_ device_driver_xirc2ps_cs_TRUE!$device_driver_xirc2ps_cs_TRUE$ac_delim device_driver_xirc2ps_cs_FALSE!$device_driver_xirc2ps_cs_FALSE$ac_delim device_driver_orinoco_cs_TRUE!$device_driver_orinoco_cs_TRUE$ac_delim @@ -159,7 +163,7 @@ Regenerate with: _ACEOF if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then -@@ -12825,6 +12894,8 @@ _ACEOF +@@ -12840,6 +12909,8 @@ _ACEOF ac_delim='%!_!# ' for ac_last_try in false false false false false :; do cat >conf$$subs.sed <<_ACEOF @@ -168,7 +172,7 @@ Regenerate with: device_driver_group_net_FALSE!$device_driver_group_net_FALSE$ac_delim device_driver_group_pcmcia_TRUE!$device_driver_group_pcmcia_TRUE$ac_delim device_driver_group_pcmcia_FALSE!$device_driver_group_pcmcia_FALSE$ac_delim -@@ -12838,7 +12909,7 @@ LIBOBJS!$LIBOBJS$ac_delim +@@ -12853,7 +12924,7 @@ LIBOBJS!$LIBOBJS$ac_delim LTLIBOBJS!$LTLIBOBJS$ac_delim _ACEOF @@ -177,9 +181,11 @@ Regenerate with: break elif $ac_last_try; then { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 ---- Makefile.in 2007-05-26 09:04:43.000000000 +0300 -+++ Makefile.in 2007-05-26 09:56:37.000000000 +0300 -@@ -161,28 +161,6 @@ +Index: b/Makefile.in +=================================================================== +--- a/Makefile.in 2007-08-09 00:48:52.000000000 +0300 ++++ b/Makefile.in 2007-08-09 01:13:24.000000000 +0300 +@@ -225,28 +225,6 @@ # Tests. # @@ -208,30 +214,31 @@ Regenerate with: -@@ -221,15 +199,13 @@ DIST_COMMON = README $(am__configure_dep +@@ -285,15 +263,14 @@ DIST_COMMON = README $(am__configure_dep $(include_mach_eXec_HEADERS) $(srcdir)/Makefile.am \ $(srcdir)/Makefile.in $(srcdir)/Makefrag.am \ - $(srcdir)/Makerules.am $(srcdir)/config.h.in \ -- $(srcdir)/doc/Makefrag.am $(srcdir)/doc/stamp-vti \ -- $(srcdir)/doc/version.texi $(srcdir)/i386/Makefrag.am \ -- $(srcdir)/i386/linux/Makefrag.am $(srcdir)/linux/Makefrag.am \ -- $(srcdir)/tests/Makefrag.am $(srcdir)/version.c.in \ -- $(top_srcdir)/configure $(top_srcdir)/tests/test-mbchk.in \ -- AUTHORS COPYING ChangeLog INSTALL NEWS build-aux/compile \ -- build-aux/config.guess build-aux/config.sub build-aux/depcomp \ -- build-aux/install-sh build-aux/mdate-sh build-aux/missing \ -- build-aux/texinfo.tex -+ $(srcdir)/i386/Makefrag.am $(srcdir)/i386/linux/Makefrag.am \ -+ $(srcdir)/linux/Makefrag.am $(srcdir)/tests/Makefrag.am \ -+ $(srcdir)/version.c.in $(top_srcdir)/configure \ -+ $(top_srcdir)/tests/test-mbchk.in AUTHORS COPYING ChangeLog \ -+ INSTALL NEWS build-aux/compile build-aux/config.guess \ -+ build-aux/config.sub build-aux/depcomp build-aux/install-sh \ -+ build-aux/mdate-sh build-aux/missing build-aux/texinfo.tex + $(srcdir)/Makerules.am $(srcdir)/Makerules.mig.am \ +- $(srcdir)/config.h.in $(srcdir)/doc/Makefrag.am \ +- $(srcdir)/doc/stamp-vti $(srcdir)/doc/version.texi \ +- $(srcdir)/i386/Makefrag.am $(srcdir)/i386/linux/Makefrag.am \ +- $(srcdir)/linux/Makefrag.am $(srcdir)/tests/Makefrag.am \ +- $(srcdir)/version.c.in $(top_srcdir)/configure \ +- $(top_srcdir)/tests/test-mbchk.in AUTHORS COPYING ChangeLog \ +- INSTALL NEWS build-aux/compile build-aux/config.guess \ +- build-aux/config.sub build-aux/depcomp build-aux/install-sh \ +- build-aux/mdate-sh build-aux/missing build-aux/texinfo.tex ++ $(srcdir)/config.h.in $(srcdir)/i386/Makefrag.am \ ++ $(srcdir)/i386/linux/Makefrag.am $(srcdir)/linux/Makefrag.am \ ++ $(srcdir)/tests/Makefrag.am $(srcdir)/version.c.in \ ++ $(top_srcdir)/configure $(top_srcdir)/tests/test-mbchk.in \ ++ AUTHORS COPYING ChangeLog INSTALL NEWS build-aux/compile \ ++ build-aux/config.guess build-aux/config.sub build-aux/depcomp \ ++ build-aux/install-sh build-aux/mdate-sh build-aux/missing \ ++ build-aux/texinfo.tex # Do we want the icky kernel debugger? @enable_kdb_TRUE@am__append_2 = \ -@@ -608,62 +584,65 @@ DIST_COMMON = README $(am__configure_dep +@@ -672,62 +649,65 @@ DIST_COMMON = README $(am__configure_dep @device_driver_seeq8005_TRUE@ linux/src/drivers/net/seeq8005.c \ @device_driver_seeq8005_TRUE@ linux/src/drivers/net/seeq8005.h @@ -313,7 +320,7 @@ Regenerate with: @device_driver_i82365_TRUE@ linux/pcmcia-cs/modules/cirrus.h \ @device_driver_i82365_TRUE@ linux/pcmcia-cs/modules/ene.h \ @device_driver_i82365_TRUE@ linux/pcmcia-cs/modules/i82365.c \ -@@ -676,34 +655,34 @@ DIST_COMMON = README $(am__configure_dep +@@ -740,34 +720,34 @@ DIST_COMMON = README $(am__configure_dep @device_driver_i82365_TRUE@ linux/pcmcia-cs/modules/vg468.h \ @device_driver_i82365_TRUE@ linux/pcmcia-cs/modules/yenta.h @@ -357,7 +364,7 @@ Regenerate with: @device_driver_orinoco_cs_TRUE@ linux/pcmcia-cs/glue/wireless_glue.h \ @device_driver_orinoco_cs_TRUE@ linux/pcmcia-cs/wireless/hermes.c \ @device_driver_orinoco_cs_TRUE@ linux/pcmcia-cs/wireless/hermes.h \ -@@ -713,11 +692,11 @@ DIST_COMMON = README $(am__configure_dep +@@ -777,11 +757,11 @@ DIST_COMMON = README $(am__configure_dep @device_driver_orinoco_cs_TRUE@ linux/pcmcia-cs/wireless/orinoco.h \ @device_driver_orinoco_cs_TRUE@ linux/pcmcia-cs/wireless/orinoco_cs.c @@ -371,7 +378,7 @@ Regenerate with: @HOST_ix86_TRUE@ i386/i386at/autoconf.c \ @HOST_ix86_TRUE@ i386/i386at/boothdr.S \ @HOST_ix86_TRUE@ i386/i386at/com.c \ -@@ -731,6 +710,7 @@ DIST_COMMON = README $(am__configure_dep +@@ -795,6 +775,7 @@ DIST_COMMON = README $(am__configure_dep @HOST_ix86_TRUE@ i386/i386at/immc.c \ @HOST_ix86_TRUE@ i386/i386at/int_init.c \ @HOST_ix86_TRUE@ i386/i386at/interrupt.S \ @@ -379,7 +386,7 @@ Regenerate with: @HOST_ix86_TRUE@ i386/i386at/kd.c \ @HOST_ix86_TRUE@ i386/i386at/kd.h \ @HOST_ix86_TRUE@ i386/i386at/kd_event.c \ -@@ -751,7 +731,7 @@ DIST_COMMON = README $(am__configure_dep +@@ -815,7 +796,7 @@ DIST_COMMON = README $(am__configure_dep # # `lpr' device support. # @@ -388,7 +395,7 @@ Regenerate with: @HOST_ix86_TRUE@@enable_lpr_TRUE@ i386/i386at/lpr.c \ @HOST_ix86_TRUE@@enable_lpr_TRUE@ i386/i386at/lprreg.h -@@ -759,7 +739,7 @@ DIST_COMMON = README $(am__configure_dep +@@ -823,7 +804,7 @@ DIST_COMMON = README $(am__configure_dep # # Further source files for any i386 kernel. # @@ -397,7 +404,7 @@ Regenerate with: @HOST_ix86_TRUE@ i386/i386/ast.h \ @HOST_ix86_TRUE@ i386/i386/ast_check.c \ @HOST_ix86_TRUE@ i386/i386/ast_types.h \ -@@ -844,21 +824,21 @@ DIST_COMMON = README $(am__configure_dep +@@ -908,21 +889,21 @@ DIST_COMMON = README $(am__configure_dep # # Instead of listing each file individually... @@ -422,10 +429,10 @@ Regenerate with: @HOST_ix86_TRUE@ chips/busses.c \ @HOST_ix86_TRUE@ chips/busses.h \ @HOST_ix86_TRUE@ device/cirbuf.c -@@ -869,14 +849,14 @@ DIST_COMMON = README $(am__configure_dep +@@ -933,14 +914,14 @@ DIST_COMMON = README $(am__configure_dep + # + # See Makerules.mig.am. # - - # See Makefrag.am about lib_dep_tr_for_defs.a. -@HOST_ix86_TRUE@am__append_115 = \ +@HOST_ix86_TRUE@am__append_116 = \ @HOST_ix86_TRUE@ i386/i386/mach_i386.server.defs.c @@ -440,7 +447,7 @@ Regenerate with: @HOST_ix86_TRUE@@PLATFORM_at_TRUE@ --defsym _START=0x100000 \ @HOST_ix86_TRUE@@PLATFORM_at_TRUE@ -T '$(srcdir)'/i386/ldscript -@@ -962,10 +942,10 @@ am__libkernel_a_SOURCES_DIST = ddb/db_ac +@@ -1026,10 +1007,10 @@ am__libkernel_a_SOURCES_DIST = ddb/db_ac kern/time_out.h kern/time_stamp.c kern/time_stamp.h \ kern/timer.c kern/timer.h kern/xpr.c kern/xpr.h kern/zalloc.c \ kern/zalloc.h kern/elf-load.c kern/boot_script.c \ @@ -455,7 +462,7 @@ Regenerate with: vm/vm_object.c vm/vm_object.h vm/vm_page.h vm/vm_pageout.c \ vm/vm_pageout.h vm/vm_resident.c vm/vm_user.c vm/vm_user.h \ device/blkio.c device/buf.h device/chario.c device/cirbuf.h \ -@@ -982,12 +962,13 @@ am__libkernel_a_SOURCES_DIST = ddb/db_ac +@@ -1046,12 +1027,13 @@ am__libkernel_a_SOURCES_DIST = ddb/db_ac i386/i386at/cons_conf.c i386/i386at/cram.h i386/i386at/disk.h \ i386/i386at/i8250.h i386/i386at/idt.h i386/i386at/immc.c \ i386/i386at/int_init.c i386/i386at/interrupt.S \ @@ -475,7 +482,7 @@ Regenerate with: i386/include/mach/sa/stdarg.h i386/i386at/lpr.c \ i386/i386at/lprreg.h i386/i386/ast.h i386/i386/ast_check.c \ i386/i386/ast_types.h i386/i386/cpu_number.h \ -@@ -1044,6 +1025,7 @@ am__libkernel_a_SOURCES_DIST = ddb/db_ac +@@ -1108,6 +1090,7 @@ am__libkernel_a_SOURCES_DIST = ddb/db_ac @HOST_ix86_TRUE@ i386/i386at/immc.$(OBJEXT) \ @HOST_ix86_TRUE@ i386/i386at/int_init.$(OBJEXT) \ @HOST_ix86_TRUE@ i386/i386at/interrupt.$(OBJEXT) \ @@ -483,7 +490,7 @@ Regenerate with: @HOST_ix86_TRUE@ i386/i386at/kd.$(OBJEXT) \ @HOST_ix86_TRUE@ i386/i386at/kd_event.$(OBJEXT) \ @HOST_ix86_TRUE@ i386/i386at/kd_mouse.$(OBJEXT) \ -@@ -1120,9 +1102,10 @@ am_libkernel_a_OBJECTS = $(am__objects_2 +@@ -1184,9 +1167,10 @@ am_libkernel_a_OBJECTS = $(am__objects_2 kern/xpr.$(OBJEXT) kern/zalloc.$(OBJEXT) \ kern/elf-load.$(OBJEXT) kern/boot_script.$(OBJEXT) \ util/putchar.$(OBJEXT) util/puts.$(OBJEXT) \ @@ -497,7 +504,7 @@ Regenerate with: vm/vm_object.$(OBJEXT) vm/vm_pageout.$(OBJEXT) \ vm/vm_resident.$(OBJEXT) vm/vm_user.$(OBJEXT) \ device/blkio.$(OBJEXT) device/chario.$(OBJEXT) \ -@@ -1267,7 +1250,8 @@ am__liblinux_a_SOURCES_DIST = linux/dev/ +@@ -1331,7 +1315,8 @@ am__liblinux_a_SOURCES_DIST = linux/dev/ linux/src/drivers/net/rtl8139.c \ linux/src/drivers/net/seeq8005.c \ linux/src/drivers/net/seeq8005.h \ @@ -507,7 +514,7 @@ Regenerate with: linux/src/drivers/net/smc-ultra.c \ linux/src/drivers/net/smc-ultra32.c \ linux/src/drivers/net/starfire.c \ -@@ -1377,23 +1361,24 @@ am__liblinux_a_SOURCES_DIST = linux/dev/ +@@ -1441,23 +1426,24 @@ am__liblinux_a_SOURCES_DIST = linux/dev/ @device_driver_pcnet32_TRUE@am__objects_78 = linux/src/drivers/net/liblinux_a-pcnet32.$(OBJEXT) @device_driver_rtl8139_TRUE@am__objects_79 = linux/src/drivers/net/liblinux_a-rtl8139.$(OBJEXT) @device_driver_seeq8005_TRUE@am__objects_80 = linux/src/drivers/net/liblinux_a-seeq8005.$(OBJEXT) @@ -546,7 +553,7 @@ Regenerate with: am_liblinux_a_OBJECTS = linux/dev/init/liblinux_a-version.$(OBJEXT) \ linux/dev/kernel/liblinux_a-softirq.$(OBJEXT) \ linux/src/arch/i386/lib/liblinux_a-delay.$(OBJEXT) \ -@@ -1440,7 +1425,7 @@ am_liblinux_a_OBJECTS = linux/dev/init/l +@@ -1504,7 +1490,7 @@ am_liblinux_a_OBJECTS = linux/dev/init/l $(am__objects_85) $(am__objects_86) $(am__objects_87) \ $(am__objects_88) $(am__objects_89) $(am__objects_90) \ $(am__objects_91) $(am__objects_92) $(am__objects_93) \ @@ -555,7 +562,7 @@ Regenerate with: liblinux_a_OBJECTS = $(am_liblinux_a_OBJECTS) liblinux_pcmcia_cs_clients_a_AR = $(AR) $(ARFLAGS) liblinux_pcmcia_cs_clients_a_LIBADD = -@@ -1455,19 +1440,19 @@ am__liblinux_pcmcia_cs_clients_a_SOURCES +@@ -1519,19 +1505,19 @@ am__liblinux_pcmcia_cs_clients_a_SOURCES linux/src/drivers/net/8390.c linux/pcmcia-cs/clients/ositech.h \ linux/pcmcia-cs/clients/smc91c92_cs.c \ linux/pcmcia-cs/clients/xirc2ps_cs.c @@ -587,7 +594,7 @@ Regenerate with: liblinux_pcmcia_cs_clients_a_OBJECTS = \ $(am_liblinux_pcmcia_cs_clients_a_OBJECTS) liblinux_pcmcia_cs_modules_a_AR = $(AR) $(ARFLAGS) -@@ -1492,7 +1477,7 @@ am__liblinux_pcmcia_cs_modules_a_SOURCES +@@ -1556,7 +1542,7 @@ am__liblinux_pcmcia_cs_modules_a_SOURCES linux/pcmcia-cs/modules/topic.h \ linux/pcmcia-cs/modules/vg468.h \ linux/pcmcia-cs/modules/yenta.h @@ -596,7 +603,7 @@ Regenerate with: am_liblinux_pcmcia_cs_modules_a_OBJECTS = linux/pcmcia-cs/glue/liblinux_pcmcia_cs_modules_a-pcmcia.$(OBJEXT) \ linux/pcmcia-cs/modules/liblinux_pcmcia_cs_modules_a-cs.$(OBJEXT) \ linux/pcmcia-cs/modules/liblinux_pcmcia_cs_modules_a-ds.$(OBJEXT) \ -@@ -1500,7 +1485,7 @@ am_liblinux_pcmcia_cs_modules_a_OBJECTS +@@ -1564,7 +1550,7 @@ am_liblinux_pcmcia_cs_modules_a_OBJECTS linux/pcmcia-cs/modules/liblinux_pcmcia_cs_modules_a-bulkmem.$(OBJEXT) \ linux/pcmcia-cs/modules/liblinux_pcmcia_cs_modules_a-cistpl.$(OBJEXT) \ linux/pcmcia-cs/modules/liblinux_pcmcia_cs_modules_a-pci_fixup.$(OBJEXT) \ @@ -605,7 +612,7 @@ Regenerate with: liblinux_pcmcia_cs_modules_a_OBJECTS = \ $(am_liblinux_pcmcia_cs_modules_a_OBJECTS) liblinux_pcmcia_cs_wireless_a_AR = $(AR) $(ARFLAGS) -@@ -1514,10 +1499,10 @@ am__liblinux_pcmcia_cs_wireless_a_SOURCE +@@ -1578,10 +1564,10 @@ am__liblinux_pcmcia_cs_wireless_a_SOURCE linux/pcmcia-cs/wireless/orinoco.c \ linux/pcmcia-cs/wireless/orinoco.h \ linux/pcmcia-cs/wireless/orinoco_cs.c @@ -618,7 +625,7 @@ Regenerate with: liblinux_pcmcia_cs_wireless_a_OBJECTS = \ $(am_liblinux_pcmcia_cs_wireless_a_OBJECTS) am__installdirs = "$(DESTDIR)$(exec_bootdir)" "$(DESTDIR)$(infodir)" \ -@@ -1559,14 +1544,13 @@ DIST_SOURCES = $(am__libkernel_a_SOURCES +@@ -1623,14 +1609,13 @@ DIST_SOURCES = $(am__libkernel_a_SOURCES $(am__liblinux_pcmcia_cs_modules_a_SOURCES_DIST) \ $(am__liblinux_pcmcia_cs_wireless_a_SOURCES_DIST) \ $(gnumach_SOURCES) $(gnumach_o_SOURCES) @@ -638,7 +645,7 @@ Regenerate with: TEXI2DVI = texi2dvi TEXI2PDF = $(TEXI2DVI) --pdf --batch MAKEINFOHTML = $(MAKEINFO) --html -@@ -1848,6 +1832,8 @@ device_driver_seagate_FALSE = @device_dr +@@ -1912,6 +1897,8 @@ device_driver_seagate_FALSE = @device_dr device_driver_seagate_TRUE = @device_driver_seagate_TRUE@ device_driver_seeq8005_FALSE = @device_driver_seeq8005_FALSE@ device_driver_seeq8005_TRUE = @device_driver_seeq8005_TRUE@ @@ -647,7 +654,7 @@ Regenerate with: device_driver_sk_g16_FALSE = @device_driver_sk_g16_FALSE@ device_driver_sk_g16_TRUE = @device_driver_sk_g16_TRUE@ device_driver_smc91c92_cs_FALSE = @device_driver_smc91c92_cs_FALSE@ -@@ -1950,8 +1936,7 @@ EXTRA_DIST = gensym.awk ipc/mach_port.sr +@@ -2014,8 +2001,7 @@ EXTRA_DIST = gensym.awk ipc/mach_port.sr linux/src/drivers/scsi/NCR5380.h linux/src/drivers/net/8390.h \ linux/src/drivers/net/kern_compat.h linux/pcmcia-cs/glue/ds.c \ linux/dev/README linux/src/COPYING linux/dev/include \ @@ -657,9 +664,9 @@ Regenerate with: Makefile.correct_output_files_for_.S_files.patch \ config.status.dep.patch ChangeLog.0 ChangeLog.00 DEVELOPMENT -@@ -1974,9 +1959,9 @@ DISTCHECK_CONFIGURE_FLAGS = --enable-kdb - # <http://lists.gnu.org/archive/html/automake/2006-10/msg00039.html> about what - # we really want to do. +@@ -2030,9 +2016,9 @@ DISTCHECK_CONFIGURE_FLAGS = --enable-kdb + # The main kernel functionality. + # noinst_LIBRARIES = libkernel.a lib_dep_tr_for_defs.a $(am__append_4) \ - $(am__append_96) + $(am__append_97) @@ -669,7 +676,7 @@ Regenerate with: # kern/mach.server.defs # kern/mach4.server.defs # kern/mach_debug.server.defs -@@ -2073,10 +2058,10 @@ libkernel_a_SOURCES = $(am__append_2) ip +@@ -2128,10 +2114,10 @@ libkernel_a_SOURCES = $(am__append_2) ip kern/time_out.h kern/time_stamp.c kern/time_stamp.h \ kern/timer.c kern/timer.h kern/xpr.c kern/xpr.h kern/zalloc.c \ kern/zalloc.h kern/elf-load.c kern/boot_script.c \ @@ -684,7 +691,7 @@ Regenerate with: vm/vm_object.c vm/vm_object.h vm/vm_page.h vm/vm_pageout.c \ vm/vm_pageout.h vm/vm_resident.c vm/vm_user.c vm/vm_user.h \ device/blkio.c device/buf.h device/chario.c device/cirbuf.h \ -@@ -2087,9 +2072,9 @@ libkernel_a_SOURCES = $(am__append_2) ip +@@ -2142,9 +2128,9 @@ libkernel_a_SOURCES = $(am__append_2) ip device/ds_routines.c device/ds_routines.h device/errno.h \ device/if_ether.h device/if_hdr.h device/io_req.h \ device/net_io.c device/net_io.h device/param.h device/subrs.c \ @@ -697,7 +704,7 @@ Regenerate with: # # Version number. -@@ -2113,10 +2098,10 @@ nodist_libkernel_a_SOURCES = version.c v +@@ -2168,10 +2154,10 @@ nodist_libkernel_a_SOURCES = version.c v kern/mach4.server.msgids kern/mach_debug.server.h \ kern/mach_debug.server.c kern/mach_debug.server.msgids \ kern/mach_host.server.h kern/mach_host.server.c \ @@ -710,8 +717,8 @@ Regenerate with: +gnumach_LINKFLAGS = $(am__append_118) # - # Installation. -@@ -2219,7 +2204,7 @@ nodist_lib_dep_tr_for_defs_a_SOURCES = + # Automatically generated source files. +@@ -2197,7 +2183,7 @@ nodist_lib_dep_tr_for_defs_a_SOURCES = device/device.server.defs.c device/device_pager.server.defs.c \ ipc/mach_port.server.defs.c kern/mach.server.defs.c \ kern/mach4.server.defs.c kern/mach_debug.server.defs.c \ @@ -720,7 +727,7 @@ Regenerate with: # Preprocess only. lib_dep_tr_for_defs_a_CPPFLAGS = $(AM_CPPFLAGS) \ -E -@@ -2280,7 +2265,8 @@ liblinux_a_SOURCES = linux/dev/init/vers +@@ -2341,7 +2327,8 @@ liblinux_a_SOURCES = linux/dev/init/vers $(am__append_85) $(am__append_86) $(am__append_87) \ $(am__append_88) $(am__append_89) $(am__append_90) \ $(am__append_91) $(am__append_92) $(am__append_93) \ @@ -730,7 +737,7 @@ Regenerate with: # pcmcia-cs. liblinux_pcmcia_cs_modules_a_CPPFLAGS = $(liblinux_a_CPPFLAGS) \ -@@ -2297,24 +2283,24 @@ liblinux_pcmcia_cs_modules_a_SOURCES = l +@@ -2358,24 +2345,24 @@ liblinux_pcmcia_cs_modules_a_SOURCES = l linux/pcmcia-cs/modules/rsrc_mgr.c \ linux/pcmcia-cs/modules/bulkmem.c \ linux/pcmcia-cs/modules/cistpl.c \ @@ -761,7 +768,7 @@ Regenerate with: # # Installation. -@@ -2340,14 +2326,6 @@ liblinux_pcmcia_cs_wireless_a_SOURCES = +@@ -2401,14 +2388,6 @@ liblinux_pcmcia_cs_wireless_a_SOURCES = @HOST_ix86_TRUE@ i386/include/mach/i386/vm_param.h \ @HOST_ix86_TRUE@ i386/include/mach/i386/vm_types.h @@ -776,7 +783,7 @@ Regenerate with: # Makerules: how to do some things. -@@ -2356,6 +2334,7 @@ web = doc/web +@@ -2417,6 +2396,7 @@ web = doc/web # Test suite. # Documentation. @@ -784,16 +791,16 @@ Regenerate with: # # Kernel Image -@@ -2390,7 +2369,7 @@ all: config.h +@@ -2451,7 +2431,7 @@ all: config.h .SUFFIXES: .S .c .dvi .o .obj .ps am--refresh: @: --$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(srcdir)/Makerules.am $(srcdir)/Makefrag.am $(srcdir)/linux/Makefrag.am $(srcdir)/i386/linux/Makefrag.am $(srcdir)/i386/Makefrag.am $(srcdir)/tests/Makefrag.am $(srcdir)/doc/Makefrag.am $(am__configure_deps) -+$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(srcdir)/Makerules.am $(srcdir)/Makefrag.am $(srcdir)/linux/Makefrag.am $(srcdir)/i386/linux/Makefrag.am $(srcdir)/i386/Makefrag.am $(srcdir)/tests/Makefrag.am $(am__configure_deps) +-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(srcdir)/Makerules.am $(srcdir)/Makerules.mig.am $(srcdir)/Makefrag.am $(srcdir)/linux/Makefrag.am $(srcdir)/i386/linux/Makefrag.am $(srcdir)/i386/Makefrag.am $(srcdir)/tests/Makefrag.am $(srcdir)/doc/Makefrag.am $(am__configure_deps) ++$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(srcdir)/Makerules.am $(srcdir)/Makerules.mig.am $(srcdir)/Makefrag.am $(srcdir)/linux/Makefrag.am $(srcdir)/i386/linux/Makefrag.am $(srcdir)/i386/Makefrag.am $(srcdir)/tests/Makefrag.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ -@@ -2680,6 +2659,8 @@ util/putchar.$(OBJEXT): util/$(am__dirst +@@ -2741,6 +2721,8 @@ util/putchar.$(OBJEXT): util/$(am__dirst util/$(DEPDIR)/$(am__dirstamp) util/puts.$(OBJEXT): util/$(am__dirstamp) \ util/$(DEPDIR)/$(am__dirstamp) @@ -802,7 +809,7 @@ Regenerate with: vm/memory_object.$(OBJEXT): vm/$(am__dirstamp) \ vm/$(DEPDIR)/$(am__dirstamp) vm/vm_debug.$(OBJEXT): vm/$(am__dirstamp) vm/$(DEPDIR)/$(am__dirstamp) -@@ -2740,6 +2721,8 @@ i386/i386at/int_init.$(OBJEXT): i386/i38 +@@ -2801,6 +2783,8 @@ i386/i386at/int_init.$(OBJEXT): i386/i38 i386/i386at/$(DEPDIR)/$(am__dirstamp) i386/i386at/interrupt.$(OBJEXT): i386/i386at/$(am__dirstamp) \ i386/i386at/$(DEPDIR)/$(am__dirstamp) @@ -811,7 +818,7 @@ Regenerate with: i386/i386at/kd.$(OBJEXT): i386/i386at/$(am__dirstamp) \ i386/i386at/$(DEPDIR)/$(am__dirstamp) i386/i386at/kd_event.$(OBJEXT): i386/i386at/$(am__dirstamp) \ -@@ -3286,6 +3269,9 @@ linux/src/drivers/net/liblinux_a-rtl8139 +@@ -3347,6 +3331,9 @@ linux/src/drivers/net/liblinux_a-rtl8139 linux/src/drivers/net/liblinux_a-seeq8005.$(OBJEXT): \ linux/src/drivers/net/$(am__dirstamp) \ linux/src/drivers/net/$(DEPDIR)/$(am__dirstamp) @@ -821,7 +828,7 @@ Regenerate with: linux/src/drivers/net/liblinux_a-sk_g16.$(OBJEXT): \ linux/src/drivers/net/$(am__dirstamp) \ linux/src/drivers/net/$(DEPDIR)/$(am__dirstamp) -@@ -3545,6 +3531,7 @@ mostlyclean-compile: +@@ -3606,6 +3593,7 @@ mostlyclean-compile: -rm -f i386/i386at/immc.$(OBJEXT) -rm -f i386/i386at/int_init.$(OBJEXT) -rm -f i386/i386at/interrupt.$(OBJEXT) @@ -829,7 +836,7 @@ Regenerate with: -rm -f i386/i386at/kd.$(OBJEXT) -rm -f i386/i386at/kd_event.$(OBJEXT) -rm -f i386/i386at/kd_mouse.$(OBJEXT) -@@ -3716,6 +3703,7 @@ mostlyclean-compile: +@@ -3777,6 +3765,7 @@ mostlyclean-compile: -rm -f linux/src/drivers/net/liblinux_a-pcnet32.$(OBJEXT) -rm -f linux/src/drivers/net/liblinux_a-rtl8139.$(OBJEXT) -rm -f linux/src/drivers/net/liblinux_a-seeq8005.$(OBJEXT) @@ -837,7 +844,7 @@ Regenerate with: -rm -f linux/src/drivers/net/liblinux_a-sk_g16.$(OBJEXT) -rm -f linux/src/drivers/net/liblinux_a-smc-ultra.$(OBJEXT) -rm -f linux/src/drivers/net/liblinux_a-smc-ultra32.$(OBJEXT) -@@ -3774,6 +3762,7 @@ mostlyclean-compile: +@@ -3835,6 +3824,7 @@ mostlyclean-compile: -rm -f vm/lib_dep_tr_for_defs_a-memory_object_user.user.defs.$(OBJEXT) -rm -f vm/memory_object.$(OBJEXT) -rm -f vm/memory_object_default.user.$(OBJEXT) @@ -845,7 +852,7 @@ Regenerate with: -rm -f vm/memory_object_user.user.$(OBJEXT) -rm -f vm/vm_debug.$(OBJEXT) -rm -f vm/vm_external.$(OBJEXT) -@@ -3864,6 +3853,7 @@ distclean-compile: +@@ -3925,6 +3915,7 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@i386/i386at/$(DEPDIR)/cons_conf.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@i386/i386at/$(DEPDIR)/immc.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@i386/i386at/$(DEPDIR)/int_init.Po@am__quote@ @@ -853,7 +860,7 @@ Regenerate with: @AMDEP_TRUE@@am__include@ @am__quote@i386/i386at/$(DEPDIR)/kd.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@i386/i386at/$(DEPDIR)/kd_event.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@i386/i386at/$(DEPDIR)/kd_mouse.Po@am__quote@ -@@ -4033,6 +4023,7 @@ distclean-compile: +@@ -4094,6 +4085,7 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@linux/src/drivers/net/$(DEPDIR)/liblinux_a-pcnet32.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@linux/src/drivers/net/$(DEPDIR)/liblinux_a-rtl8139.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@linux/src/drivers/net/$(DEPDIR)/liblinux_a-seeq8005.Po@am__quote@ @@ -861,7 +868,7 @@ Regenerate with: @AMDEP_TRUE@@am__include@ @am__quote@linux/src/drivers/net/$(DEPDIR)/liblinux_a-sk_g16.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@linux/src/drivers/net/$(DEPDIR)/liblinux_a-smc-ultra.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@linux/src/drivers/net/$(DEPDIR)/liblinux_a-smc-ultra32.Po@am__quote@ -@@ -4091,6 +4082,7 @@ distclean-compile: +@@ -4152,6 +4144,7 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@vm/$(DEPDIR)/lib_dep_tr_for_defs_a-memory_object_user.user.defs.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@vm/$(DEPDIR)/memory_object.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@vm/$(DEPDIR)/memory_object_default.user.Po@am__quote@ @@ -869,7 +876,7 @@ Regenerate with: @AMDEP_TRUE@@am__include@ @am__quote@vm/$(DEPDIR)/memory_object_user.user.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@vm/$(DEPDIR)/vm_debug.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@vm/$(DEPDIR)/vm_external.Po@am__quote@ -@@ -5811,6 +5803,20 @@ linux/src/drivers/net/liblinux_a-seeq800 +@@ -5872,6 +5865,20 @@ linux/src/drivers/net/liblinux_a-seeq800 @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblinux_a_CPPFLAGS) $(CPPFLAGS) $(liblinux_a_CFLAGS) $(CFLAGS) -c -o linux/src/drivers/net/liblinux_a-seeq8005.obj `if test -f 'linux/src/drivers/net/seeq8005.c'; then $(CYGPATH_W) 'linux/src/drivers/net/seeq8005.c'; else $(CYGPATH_W) '$(srcdir)/linux/src/drivers/net/seeq8005.c'; fi` @@ -890,7 +897,7 @@ Regenerate with: linux/src/drivers/net/liblinux_a-sk_g16.o: linux/src/drivers/net/sk_g16.c @am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblinux_a_CPPFLAGS) $(CPPFLAGS) $(liblinux_a_CFLAGS) $(CFLAGS) -MT linux/src/drivers/net/liblinux_a-sk_g16.o -MD -MP -MF "linux/src/drivers/net/$(DEPDIR)/liblinux_a-sk_g16.Tpo" -c -o linux/src/drivers/net/liblinux_a-sk_g16.o `test -f 'linux/src/drivers/net/sk_g16.c' || echo '$(srcdir)/'`linux/src/drivers/net/sk_g16.c; \ @am__fastdepCC_TRUE@ then mv -f "linux/src/drivers/net/$(DEPDIR)/liblinux_a-sk_g16.Tpo" "linux/src/drivers/net/$(DEPDIR)/liblinux_a-sk_g16.Po"; else rm -f "linux/src/drivers/net/$(DEPDIR)/liblinux_a-sk_g16.Tpo"; exit 1; fi -@@ -6272,74 +6278,6 @@ linux/pcmcia-cs/wireless/liblinux_pcmcia +@@ -6333,74 +6340,6 @@ linux/pcmcia-cs/wireless/liblinux_pcmcia @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='linux/pcmcia-cs/wireless/orinoco_cs.c' object='linux/pcmcia-cs/wireless/liblinux_pcmcia_cs_wireless_a-orinoco_cs.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblinux_pcmcia_cs_wireless_a_CPPFLAGS) $(CPPFLAGS) $(liblinux_pcmcia_cs_wireless_a_CFLAGS) $(CFLAGS) -c -o linux/pcmcia-cs/wireless/liblinux_pcmcia_cs_wireless_a-orinoco_cs.obj `if test -f 'linux/pcmcia-cs/wireless/orinoco_cs.c'; then $(CYGPATH_W) 'linux/pcmcia-cs/wireless/orinoco_cs.c'; else $(CYGPATH_W) '$(srcdir)/linux/pcmcia-cs/wireless/orinoco_cs.c'; fi` @@ -965,7 +972,7 @@ Regenerate with: .dvi.ps: TEXINPUTS="$(am__TEXINFO_TEX_DIR)$(PATH_SEPARATOR)$$TEXINPUTS" \ $(DVIPS) -o $@ $< -@@ -6385,9 +6323,7 @@ dist-info: $(INFO_DEPS) +@@ -6446,9 +6385,7 @@ dist-info: $(INFO_DEPS) done mostlyclean-aminfo: @@ -976,7 +983,7 @@ Regenerate with: maintainer-clean-aminfo: @list='$(INFO_DEPS)'; for i in $$list; do \ -@@ -6689,7 +6625,7 @@ check-TESTS: $(TESTS) +@@ -6750,7 +6687,7 @@ check-TESTS: $(TESTS) distdir: $(DISTFILES) $(am__remove_distdir) mkdir $(distdir) @@ -985,7 +992,7 @@ Regenerate with: @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ list='$(DISTFILES)'; for file in $$list; do \ -@@ -6868,7 +6804,6 @@ distclean-generic: +@@ -6929,7 +6866,6 @@ distclean-generic: -rm -f ddb/$(am__dirstamp) -rm -f device/$(DEPDIR)/$(am__dirstamp) -rm -f device/$(am__dirstamp) @@ -993,7 +1000,7 @@ Regenerate with: -rm -f i386/i386/$(DEPDIR)/$(am__dirstamp) -rm -f i386/i386/$(am__dirstamp) -rm -f i386/i386at/$(DEPDIR)/$(am__dirstamp) -@@ -6946,7 +6881,7 @@ dvi-am: $(DVIS) +@@ -7007,7 +6943,7 @@ dvi-am: $(DVIS) html: html-recursive @@ -1002,7 +1009,7 @@ Regenerate with: info: info-recursive -@@ -7002,20 +6937,20 @@ maintainer-clean: maintainer-clean-recur +@@ -7063,20 +6999,20 @@ maintainer-clean: maintainer-clean-recur -rm -rf ./$(DEPDIR) chips/$(DEPDIR) ddb/$(DEPDIR) device/$(DEPDIR) i386/i386/$(DEPDIR) i386/i386at/$(DEPDIR) i386/intel/$(DEPDIR) ipc/$(DEPDIR) kern/$(DEPDIR) linux/dev/arch/i386/kernel/$(DEPDIR) linux/dev/drivers/block/$(DEPDIR) linux/dev/drivers/net/$(DEPDIR) linux/dev/drivers/scsi/$(DEPDIR) linux/dev/glue/$(DEPDIR) linux/dev/init/$(DEPDIR) linux/dev/kernel/$(DEPDIR) linux/dev/lib/$(DEPDIR) linux/dev/net/core/$(DEPDIR) linux/pcmcia-cs/clients/$(DEPDIR) linux/pcmcia-cs/glue/$(DEPDIR) linux/pcmcia-cs/modules/$(DEPDIR) linux/pcmcia-cs/wireless/$(DEPDIR) linux/src/arch/i386/kernel/$(DEPDIR) linux/src/arch/i386/lib/$(DEPDIR) linux/src/drivers/block/$(DEPDIR) linux/src/drivers/net/$(DEPDIR) linux/src/drivers/pci/$(DEPDIR) linux/src/drivers/scsi/$(DEPDIR) linux/src/lib/$(DEPDIR) util/$(DEPDIR) vm/$(DEPDIR) -rm -f Makefile maintainer-clean-am: distclean-am maintainer-clean-aminfo \ @@ -1027,7 +1034,7 @@ Regenerate with: uninstall-am: uninstall-exec_bootPROGRAMS uninstall-exec_msgidsDATA \ uninstall-include_deviceHEADERS uninstall-include_machHEADERS \ -@@ -7032,19 +6967,18 @@ uninstall-info: uninstall-info-recursive +@@ -7093,19 +7029,18 @@ uninstall-info: uninstall-info-recursive distcheck distclean distclean-compile distclean-generic \ distclean-hdr distclean-recursive distclean-tags \ distcleancheck distdir distuninstallcheck dvi dvi-am html \ @@ -1055,7 +1062,7 @@ Regenerate with: uninstall-exec_bootPROGRAMS uninstall-exec_msgidsDATA \ uninstall-include_deviceHEADERS uninstall-include_machHEADERS \ uninstall-include_mach_eXecHEADERS \ -@@ -7184,87 +7118,6 @@ dist-hook-linux: +@@ -7242,87 +7177,6 @@ dist-hook-linux: # # ix86. |