From 4e971660a1695fbc3be4d7fb8401d29f168566be Mon Sep 17 00:00:00 2001 From: Ralf Corsepius Date: Thu, 12 Jan 2006 09:57:43 +0000 Subject: Remove all-local. --- cpukit/Makefile.am | 2 -- cpukit/ftpd/Makefile.am | 2 -- cpukit/httpd/Makefile.am | 2 -- cpukit/itron/Makefile.am | 2 -- cpukit/libblock/Makefile.am | 3 +-- cpukit/libcsupport/Makefile.am | 4 ---- cpukit/libfs/Makefile.am | 4 +--- cpukit/libmisc/Makefile.am | 4 +--- cpukit/libnetworking/Makefile.am | 28 ++++++++++++++++------------ cpukit/librpc/Makefile.am | 2 -- cpukit/posix/Makefile.am | 2 -- cpukit/pppd/Makefile.am | 2 -- cpukit/rtems/Makefile.am | 2 -- cpukit/sapi/Makefile.am | 2 -- cpukit/score/Makefile.am | 2 -- cpukit/score/cpu/arm/Makefile.am | 2 -- cpukit/score/cpu/avr/Makefile.am | 2 -- cpukit/score/cpu/c4x/Makefile.am | 2 -- cpukit/score/cpu/h8300/Makefile.am | 2 -- cpukit/score/cpu/i386/Makefile.am | 2 -- cpukit/score/cpu/m68k/Makefile.am | 2 -- cpukit/score/cpu/mips/Makefile.am | 2 -- cpukit/score/cpu/no_cpu/Makefile.am | 2 -- cpukit/score/cpu/powerpc/Makefile.am | 2 -- cpukit/score/cpu/sh/Makefile.am | 2 -- cpukit/score/cpu/sparc/Makefile.am | 2 -- cpukit/score/cpu/unix/Makefile.am | 2 -- cpukit/telnetd/Makefile.am | 2 -- cpukit/zlib/Makefile.am | 2 -- 29 files changed, 19 insertions(+), 72 deletions(-) diff --git a/cpukit/Makefile.am b/cpukit/Makefile.am index 691771be28..e37828fbd4 100644 --- a/cpukit/Makefile.am +++ b/cpukit/Makefile.am @@ -166,8 +166,6 @@ include_rtems_HEADERS += libmisc/untar/untar.h ## fsmount include_rtems_HEADERS += libmisc/fsmount/fsmount.h -all-local: $(PREINSTALL_FILES) - cpukit.doxy: cpukit.doxy.in Makefile d=`pwd`;cd $(PROJECT_INCLUDE);project_include=`pwd`;cd $$d; \ sed \ diff --git a/cpukit/ftpd/Makefile.am b/cpukit/ftpd/Makefile.am index db53ecace8..73f588ae29 100644 --- a/cpukit/ftpd/Makefile.am +++ b/cpukit/ftpd/Makefile.am @@ -9,7 +9,5 @@ project_lib_LIBRARIES = libftpd.a libftpd_a_SOURCES = ftpd.c ftpd.h endif -all-local: $(PREINSTALL_FILES) $(TMPINSTALL_FILES) - include $(srcdir)/preinstall.am include $(top_srcdir)/automake/local.am diff --git a/cpukit/httpd/Makefile.am b/cpukit/httpd/Makefile.am index 8cbd0ea5ea..a1aa779bf4 100644 --- a/cpukit/httpd/Makefile.am +++ b/cpukit/httpd/Makefile.am @@ -25,7 +25,5 @@ endif EXTRA_DIST = webcomp.c webpage.c -all-local: $(PREINSTALL_FILES) $(TMPINSTALL_FILES) - include $(srcdir)/preinstall.am include $(top_srcdir)/automake/local.am diff --git a/cpukit/itron/Makefile.am b/cpukit/itron/Makefile.am index 53d2b3296d..81ecdedd88 100644 --- a/cpukit/itron/Makefile.am +++ b/cpukit/itron/Makefile.am @@ -115,7 +115,5 @@ UNUSED_C_FILES = src/cre_mbx.c src/del_mbx.c src/mboxtranslatereturncode.c \ EXTRA_DIST += $(UNUSED_C_FILES) src/TODO -all-local: $(PREINSTALL_FILES) - include $(srcdir)/preinstall.am include $(top_srcdir)/automake/local.am diff --git a/cpukit/libblock/Makefile.am b/cpukit/libblock/Makefile.am index ca9216a0e8..6a047b5059 100644 --- a/cpukit/libblock/Makefile.am +++ b/cpukit/libblock/Makefile.am @@ -11,8 +11,7 @@ libblock_a_SOURCES = src/bdbuf.c src/blkdev.c src/diskdevs.c src/ramdisk.c \ src/ide_part_table.c include/rtems/bdbuf.h include/rtems/blkdev.h \ include/rtems/diskdevs.h include/rtems/ramdisk.h \ include/rtems/ide_part_table.h - -all-local: $(PREINSTALL_FILES) endif +include $(srcdir)/preinstall.am include $(top_srcdir)/automake/local.am diff --git a/cpukit/libcsupport/Makefile.am b/cpukit/libcsupport/Makefile.am index c01e30cfc0..e7c174f6b3 100644 --- a/cpukit/libcsupport/Makefile.am +++ b/cpukit/libcsupport/Makefile.am @@ -33,8 +33,6 @@ include_rtems_zilog_HEADERS = include/zilog/z8036.h include/zilog/z8530.h \ include/zilog/z8536.h ## General stuff -all-local: $(PREINSTALL_FILES) - ERROR_C_FILES = src/error.c ASSOCIATION_C_FILES = src/assoc.c src/assocnamebad.c @@ -92,7 +90,5 @@ endif EXTRA_DIST = src/TODO src/CASES src/README -all-local: $(PREINSTALL_FILES) - include $(srcdir)/preinstall.am include $(top_srcdir)/automake/local.am diff --git a/cpukit/libfs/Makefile.am b/cpukit/libfs/Makefile.am index 6f43c25d41..f49186b18a 100644 --- a/cpukit/libfs/Makefile.am +++ b/cpukit/libfs/Makefile.am @@ -51,8 +51,6 @@ libdosfs_a_SOURCES += src/dosfs/msdos_create.c src/dosfs/msdos_dir.c \ src/dosfs/dosfs.h endif -all-local: $(PREINSTALL_FILES) - # --- - +include $(srcdir)/preinstall.am include $(top_srcdir)/automake/local.am diff --git a/cpukit/libmisc/Makefile.am b/cpukit/libmisc/Makefile.am index 55773bf42a..630102c1fa 100644 --- a/cpukit/libmisc/Makefile.am +++ b/cpukit/libmisc/Makefile.am @@ -99,7 +99,5 @@ libfsmount_a_SOURCES = fsmount/fsmount.c fsmount/fsmount.h EXTRA_DIST += fsmount/README ## --- - -all-local: $(PREINSTALL_FILES) - +include $(srcdir)/preinstall.am include $(top_srcdir)/automake/local.am diff --git a/cpukit/libnetworking/Makefile.am b/cpukit/libnetworking/Makefile.am index dc9fcd1c5b..a4b72bd8ba 100644 --- a/cpukit/libnetworking/Makefile.am +++ b/cpukit/libnetworking/Makefile.am @@ -5,9 +5,6 @@ include $(top_srcdir)/automake/multilib.am include $(top_srcdir)/automake/compile.am -CLEANFILES = -DISTCLEANFILES = - AM_CPPFLAGS += -I$(srcdir) EXTRA_DIST = README @@ -17,8 +14,7 @@ UNUSED_FILES = poll.h # Original FreeBSD file UNUSED_FILES += sys/poll.h -UNUSED_FILES += net/zlib.c net/zlib.h -UNUSED_FILES += net/ppp.h net/ppp-deflate.c net/bsd-comp.c +UNUSED_FILES += net/ppp-deflate.c net/bsd-comp.c if HAS_NETWORKING # Add -DFORWARD_PROTOCOL to enable UDP forwarding -- requires missing net/pf.h @@ -30,12 +26,13 @@ libnetworking_a_CPPFLAGS = $(AM_CPPFLAGS) $(libnetworking_CPPFLAGS) ## poll.h is not in the list because RTEMS does not have poll() ## and installing poll.h confuses autoconf. -include_HEADERS = loop.h netdb.h +include_HEADERS = netdb.h include_HEADERS += resolv.h syslog.h libnetworking_a_SOURCES = opt_atalk.h opt_bdg.h opt_compat.h opt_inet6.h \ opt_inet.h opt_ipfw.h opt_ipx.h opt_mac.h opt_mrouting.h opt_netgraph.h \ - opt_tcpdebug.h opt_ipsec.h + opt_tcpdebug.h opt_ipsec.h loop.h +libnetworking_a_SOURCES += opt_ppp.h libnetworking_a_SOURCES += bpfilter.h # arpa @@ -68,6 +65,7 @@ include_net_HEADERS = net/bpf.h net/ethernet.h net/if.h net/if_arp.h \ net/if_dl.h net/if_llc.h net/if_ppp.h net/if_types.h net/if_var.h \ net/netisr.h net/ppp-comp.h net/ppp_defs.h net/radix.h net/raw_cb.h \ net/route.h net/if_pppvar.h net/pppcompress.h net/slcompress.h +include_net_HEADERS += net/if_media.h libnetworking_a_SOURCES += net/if.c net/if_ethersubr.c net/if_loop.c \ net/radix.c net/route.c net/rtsock.c net/raw_cb.c net/raw_usrreq.c \ @@ -98,8 +96,11 @@ libnetworking_a_SOURCES += netinet/if_ether.c netinet/igmp.c netinet/in.c \ include_nfsdir = $(includedir)/nfs -include_nfs_HEADERS = nfs/krpc.h nfs/nfs.h nfs/nfsproto.h \ - nfs/rpcv2.h nfs/xdr_subs.h +include_nfs_HEADERS = nfs/krpc.h +include_nfs_HEADERS += nfs/nfs.h +include_nfs_HEADERS += nfs/nfsproto.h +include_nfs_HEADERS += nfs/rpcv2.h +include_nfs_HEADERS += nfs/xdr_subs.h libnetworking_a_SOURCES += nfs/bootp_subr.c @@ -114,6 +115,7 @@ include_rtemsdir = $(includedir)/rtems include_rtems_HEADERS = rtems/rtems_bsdnet.h rtems/rtems_bsdnet_internal.h \ rtems/dhcp.h rtems/tftp.h rtems/ftpfs.h rtems/mkrootfs.h +include_rtems_HEADERS += rtems/rtems_mii_ioctl.h libnetworking_a_SOURCES += rtems/sghostname.c rtems/issetugid.c \ rtems/rtems_glue.c rtems/rtems_syscall.c \ @@ -122,6 +124,7 @@ libnetworking_a_SOURCES += rtems/sghostname.c rtems/issetugid.c \ rtems/rtems_showipstat.c rtems/rtems_showicmpstat.c \ rtems/rtems_showtcpstat.c rtems/rtems_showudpstat.c rtems/rtems_select.c \ rtems/mkrootfs.c rtems/rtems_bsdnet_malloc_starvation.c +libnetworking_a_SOURCES += rtems/rtems_mii_ioctl.c rtems/rtems_mii_ioctl_kern.c ## sys @@ -140,6 +143,10 @@ include_vmdir = $(includedir)/vm include_vm_HEADERS = vm/vm.h vm/vm_extern.h vm/vm_kern.h vm/vm_param.h +# dev +include_dev_miidir = $(includedir)/dev/mii +include_dev_mii_HEADERS = dev/mii/mii.h + ## libc libc_CPPFLAGS = -DNOPOLL -DNOSELECT -D__BSD_VISIBLE @@ -190,8 +197,5 @@ endif EXTRA_DIST += $(UNUSED_FILES) -all-local: $(PREINSTALL_FILES) - include $(srcdir)/preinstall.am - include $(top_srcdir)/automake/local.am diff --git a/cpukit/librpc/Makefile.am b/cpukit/librpc/Makefile.am index 83859c99f3..98663f8e3f 100644 --- a/cpukit/librpc/Makefile.am +++ b/cpukit/librpc/Makefile.am @@ -87,7 +87,5 @@ EXTRA_DIST += include/rpcsvc/bootparam_prot.x include/rpcsvc/crypt.x \ include/rpcsvc/ypupdate_prot.x include/rpcsvc/yp.x \ include/rpcsvc/ypxfrd.x -all-local: $(PREINSTALL_FILES) - include $(srcdir)/preinstall.am include $(top_srcdir)/automake/local.am diff --git a/cpukit/posix/Makefile.am b/cpukit/posix/Makefile.am index 4ca195baf5..99517c5c28 100644 --- a/cpukit/posix/Makefile.am +++ b/cpukit/posix/Makefile.am @@ -164,7 +164,5 @@ not: EXTRA_DIST += $(C_FILES) $(UNUSED_C_FILES) -all-local: $(PREINSTALL_FILES) - include $(srcdir)/preinstall.am include $(top_srcdir)/automake/local.am diff --git a/cpukit/pppd/Makefile.am b/cpukit/pppd/Makefile.am index dc9f8a06ec..bca0c59e3f 100644 --- a/cpukit/pppd/Makefile.am +++ b/cpukit/pppd/Makefile.am @@ -17,7 +17,5 @@ libpppd_a_SOURCES = auth.c ccp.c ccp.h chap.c chap.h chap_ms.c chap_ms.h \ libpppd_a_CPPFLAGS = $(AM_CPPFLAGS) -D__BSD_VISIBLE endif -all-local: $(PREINSTALL_FILES) $(TMPINSTALL_FILES) - include $(srcdir)/preinstall.am include $(top_srcdir)/automake/local.am diff --git a/cpukit/rtems/Makefile.am b/cpukit/rtems/Makefile.am index cca99b1e3c..f29b32dcf6 100644 --- a/cpukit/rtems/Makefile.am +++ b/cpukit/rtems/Makefile.am @@ -124,7 +124,5 @@ librtems_a_SOURCES += src/eventmp.c src/mp.c src/msgmp.c src/partmp.c \ src/regionmp.c src/semmp.c src/signalmp.c src/taskmp.c endif -all-local: $(PREINSTALL_FILES) - include $(srcdir)/preinstall.am include $(top_srcdir)/automake/local.am diff --git a/cpukit/sapi/Makefile.am b/cpukit/sapi/Makefile.am index 56373a5299..8389d98732 100644 --- a/cpukit/sapi/Makefile.am +++ b/cpukit/sapi/Makefile.am @@ -29,7 +29,5 @@ libsapi_a_SOURCES = src/debug.c src/extension.c src/extensioncreate.c \ src/io.c src/itronapi.c src/posixapi.c src/rtemsapi.c libsapi_a_CPPFLAGS = $(AM_CPPFLAGS) -all-local: $(PREINSTALL_FILES) - include $(srcdir)/preinstall.am include $(top_srcdir)/automake/local.am diff --git a/cpukit/score/Makefile.am b/cpukit/score/Makefile.am index 604a8c26cb..07518eb865 100644 --- a/cpukit/score/Makefile.am +++ b/cpukit/score/Makefile.am @@ -155,8 +155,6 @@ EXTRA_DIST += $(STD_C_FILES) $(MP_C_FILES) src/Unlimited.txt DISTCLEANFILES = include/rtems/score/cpuopts.h -all-local: $(PREINSTALL_FILES) - include $(srcdir)/preinstall.am include $(top_srcdir)/automake/subdirs.am include $(top_srcdir)/automake/local.am diff --git a/cpukit/score/cpu/arm/Makefile.am b/cpukit/score/cpu/arm/Makefile.am index 6b5c429b37..2290aa4123 100644 --- a/cpukit/score/cpu/arm/Makefile.am +++ b/cpukit/score/cpu/arm/Makefile.am @@ -15,7 +15,5 @@ noinst_LIBRARIES = libscorecpu.a libscorecpu_a_SOURCES = cpu.c cpu_asm.S libscorecpu_a_CPPFLAGS = $(AM_CPPFLAGS) -all-local: $(PREINSTALL_FILES) - include $(srcdir)/preinstall.am include $(top_srcdir)/automake/local.am diff --git a/cpukit/score/cpu/avr/Makefile.am b/cpukit/score/cpu/avr/Makefile.am index 9a83e2e614..69bd4636b9 100644 --- a/cpukit/score/cpu/avr/Makefile.am +++ b/cpukit/score/cpu/avr/Makefile.am @@ -15,7 +15,5 @@ noinst_LIBRARIES = libscorecpu.a libscorecpu_a_SOURCES = cpu.c cpu_asm.c libscorecpu_a_CPPFLAGS = $(AM_CPPFLAGS) -all-local: $(PREINSTALL_FILES) - include $(srcdir)/preinstall.am include $(top_srcdir)/automake/local.am diff --git a/cpukit/score/cpu/c4x/Makefile.am b/cpukit/score/cpu/c4x/Makefile.am index e924d8a0e9..e8ccf6da39 100644 --- a/cpukit/score/cpu/c4x/Makefile.am +++ b/cpukit/score/cpu/c4x/Makefile.am @@ -18,7 +18,5 @@ noinst_LIBRARIES = libscorecpu.a libscorecpu_a_SOURCES = cpu.c irq.c cpu_asm.S libscorecpu_a_CPPFLAGS = $(AM_CPPFLAGS) -all-local: $(PREINSTALL_FILES) - include $(srcdir)/preinstall.am include $(top_srcdir)/automake/local.am diff --git a/cpukit/score/cpu/h8300/Makefile.am b/cpukit/score/cpu/h8300/Makefile.am index 1ca2e64608..e3a0692391 100644 --- a/cpukit/score/cpu/h8300/Makefile.am +++ b/cpukit/score/cpu/h8300/Makefile.am @@ -15,7 +15,5 @@ noinst_LIBRARIES = libscorecpu.a libscorecpu_a_SOURCES = cpu.c cpu_asm.S libscorecpu_a_CPPFLAGS = $(AM_CPPFLAGS) -all-local: $(PREINSTALL_FILES) - include $(srcdir)/preinstall.am include $(top_srcdir)/automake/local.am diff --git a/cpukit/score/cpu/i386/Makefile.am b/cpukit/score/cpu/i386/Makefile.am index b7a13d64ff..f6c8e7f6d7 100644 --- a/cpukit/score/cpu/i386/Makefile.am +++ b/cpukit/score/cpu/i386/Makefile.am @@ -16,7 +16,5 @@ noinst_LIBRARIES = libscorecpu.a libscorecpu_a_SOURCES = cpu.c cpu_asm.S libscorecpu_a_CPPFLAGS = $(AM_CPPFLAGS) -all-local: $(PREINSTALL_FILES) - include $(srcdir)/preinstall.am include $(top_srcdir)/automake/local.am diff --git a/cpukit/score/cpu/m68k/Makefile.am b/cpukit/score/cpu/m68k/Makefile.am index 46bb6a19f0..ff7e0d1c2c 100644 --- a/cpukit/score/cpu/m68k/Makefile.am +++ b/cpukit/score/cpu/m68k/Makefile.am @@ -20,7 +20,5 @@ include_rtems_score_HEADERS = rtems/score/cpu.h rtems/score/m68k.h \ libscorecpu_a_SOURCES = cpu.c cpu_asm.S -all-local: $(PREINSTALL_FILES) - include $(srcdir)/preinstall.am include $(top_srcdir)/automake/local.am diff --git a/cpukit/score/cpu/mips/Makefile.am b/cpukit/score/cpu/mips/Makefile.am index 5a4dad6ba8..bb7d3faf4b 100644 --- a/cpukit/score/cpu/mips/Makefile.am +++ b/cpukit/score/cpu/mips/Makefile.am @@ -18,7 +18,5 @@ noinst_LIBRARIES = libscorecpu.a libscorecpu_a_SOURCES = cpu.c cpu_asm.S libscorecpu_a_CPPFLAGS = $(AM_CPPFLAGS) -all-local: $(PREINSTALL_FILES) - include $(srcdir)/preinstall.am include $(top_srcdir)/automake/local.am diff --git a/cpukit/score/cpu/no_cpu/Makefile.am b/cpukit/score/cpu/no_cpu/Makefile.am index 18189d141d..1c74eb72f4 100644 --- a/cpukit/score/cpu/no_cpu/Makefile.am +++ b/cpukit/score/cpu/no_cpu/Makefile.am @@ -15,7 +15,5 @@ noinst_LIBRARIES = libscorecpu.a libscorecpu_a_SOURCES = cpu.c cpu_asm.c libscorecpu_a_CPPFLAGS = $(AM_CPPFLAGS) -all-local: $(PREINSTALL_FILES) - include $(srcdir)/preinstall.am include $(top_srcdir)/automake/local.am diff --git a/cpukit/score/cpu/powerpc/Makefile.am b/cpukit/score/cpu/powerpc/Makefile.am index fb10b52771..b9732b4225 100644 --- a/cpukit/score/cpu/powerpc/Makefile.am +++ b/cpukit/score/cpu/powerpc/Makefile.am @@ -27,7 +27,5 @@ noinst_LIBRARIES = libscorecpu.a libscorecpu_a_SOURCES = cpu.c libscorecpu_a_CPPFLAGS = $(AM_CPPFLAGS) -all-local: $(PREINSTALL_FILES) - include $(srcdir)/preinstall.am include $(top_srcdir)/automake/local.am diff --git a/cpukit/score/cpu/sh/Makefile.am b/cpukit/score/cpu/sh/Makefile.am index 29f9e14644..8ce6a27ea3 100644 --- a/cpukit/score/cpu/sh/Makefile.am +++ b/cpukit/score/cpu/sh/Makefile.am @@ -15,7 +15,5 @@ noinst_LIBRARIES = libscorecpu.a libscorecpu_a_SOURCES = cpu.c libscorecpu_a_CPPFLAGS = $(AM_CPPFLAGS) -all-local: $(PREINSTALL_FILES) - include $(srcdir)/preinstall.am include $(top_srcdir)/automake/local.am diff --git a/cpukit/score/cpu/sparc/Makefile.am b/cpukit/score/cpu/sparc/Makefile.am index 2d648f8b18..6d4c4aead1 100644 --- a/cpukit/score/cpu/sparc/Makefile.am +++ b/cpukit/score/cpu/sparc/Makefile.am @@ -15,7 +15,5 @@ noinst_LIBRARIES = libscorecpu.a libscorecpu_a_SOURCES = cpu.c cpu_asm.S libscorecpu_a_CPPFLAGS = $(AM_CPPFLAGS) -all-local: $(PREINSTALL_FILES) - include $(srcdir)/preinstall.am include $(top_srcdir)/automake/local.am diff --git a/cpukit/score/cpu/unix/Makefile.am b/cpukit/score/cpu/unix/Makefile.am index bb99bf5326..fdf5dbf979 100644 --- a/cpukit/score/cpu/unix/Makefile.am +++ b/cpukit/score/cpu/unix/Makefile.am @@ -17,7 +17,5 @@ noinst_LIBRARIES = libscorecpu.a libscorecpu_a_SOURCES = cpu.c libscorecpu_a_CPPFLAGS = $(AM_CPPFLAGS) -all-local: $(PREINSTALL_FILES) - include $(srcdir)/preinstall.am include $(top_srcdir)/automake/local.am diff --git a/cpukit/telnetd/Makefile.am b/cpukit/telnetd/Makefile.am index 2b027dfbf3..2f48393056 100644 --- a/cpukit/telnetd/Makefile.am +++ b/cpukit/telnetd/Makefile.am @@ -17,7 +17,5 @@ endif EXTRA_DIST = README -all-local: $(PREINSTALL_FILES) $(TMPINSTALL_FILES) - include $(srcdir)/preinstall.am include $(top_srcdir)/automake/local.am diff --git a/cpukit/zlib/Makefile.am b/cpukit/zlib/Makefile.am index bdda067908..a36d96c42a 100644 --- a/cpukit/zlib/Makefile.am +++ b/cpukit/zlib/Makefile.am @@ -24,7 +24,5 @@ libz_a_SOURCES += zutil.c zutil.h include_HEADERS = zlib.h zconf.h -all-local: $(PREINSTALL_FILES) $(TMPINSTALL_FILES) - include $(srcdir)/preinstall.am include $(top_srcdir)/automake/local.am -- cgit v1.2.3