From dbe8e5194cf71cb20e7a05ff382ad70e833fd3e6 Mon Sep 17 00:00:00 2001 From: Ralf Corsepius Date: Thu, 12 Jan 2006 04:19:28 +0000 Subject: Cleanups --- cpukit/Makefile.am | 16 +++++++++++----- cpukit/ftpd/Makefile.am | 4 ---- cpukit/httpd/Makefile.am | 4 ---- cpukit/itron/Makefile.am | 3 --- cpukit/libcsupport/Makefile.am | 4 ---- cpukit/libi2c/Makefile.am | 4 ---- cpukit/librpc/Makefile.am | 3 --- cpukit/posix/Makefile.am | 3 --- cpukit/pppd/Makefile.am | 4 ---- cpukit/rtems/Makefile.am | 4 ---- cpukit/sapi/Makefile.am | 4 ---- cpukit/score/Makefile.am | 6 +----- cpukit/score/cpu/arm/Makefile.am | 4 ---- cpukit/score/cpu/avr/Makefile.am | 4 ---- cpukit/score/cpu/c4x/Makefile.am | 4 ---- cpukit/score/cpu/h8300/Makefile.am | 4 ---- cpukit/score/cpu/i386/Makefile.am | 4 ---- cpukit/score/cpu/m68k/Makefile.am | 4 ---- cpukit/score/cpu/mips/Makefile.am | 4 ---- cpukit/score/cpu/no_cpu/Makefile.am | 4 ---- cpukit/score/cpu/powerpc/Makefile.am | 4 ---- cpukit/score/cpu/sh/Makefile.am | 4 ---- cpukit/score/cpu/sparc/Makefile.am | 4 ---- cpukit/score/cpu/unix/Makefile.am | 4 ---- cpukit/telnetd/Makefile.am | 4 ---- cpukit/wrapup/Makefile.am | 3 --- cpukit/zlib/Makefile.am | 4 ---- 27 files changed, 12 insertions(+), 106 deletions(-) (limited to 'cpukit') diff --git a/cpukit/Makefile.am b/cpukit/Makefile.am index 8b78fe0a23..691771be28 100644 --- a/cpukit/Makefile.am +++ b/cpukit/Makefile.am @@ -23,14 +23,11 @@ SUBDIRS += ftpd SUBDIRS += telnetd SUBDIRS += pppd -CLEANFILES = -DISTCLEANFILES = - noinst_DATA = preinstall-stamp preinstall-stamp: $(MAKE) $(AM_MAKEFLAGS) preinstall touch preinstall-stamp -CLEANFILES += preinstall-stamp +CLEANFILES = preinstall-stamp include_HEADERS = @@ -171,7 +168,16 @@ include_rtems_HEADERS += libmisc/fsmount/fsmount.h all-local: $(PREINSTALL_FILES) -include $(srcdir)/preinstall.am +cpukit.doxy: cpukit.doxy.in Makefile + d=`pwd`;cd $(PROJECT_INCLUDE);project_include=`pwd`;cd $$d; \ + sed \ + -e "s,[@]PROJECT_INCLUDE[@],$${project_include}," \ + -e 's,[@]DOXY_FILTER[@],$(top_srcdir)/$(RTEMS_TOPdir)/tools/build/doxy-filter,' \ + $(srcdir)/cpukit.doxy.in > cpukit.doxy + +doxy: preinstall-stamp cpukit.doxy + doxygen cpukit.doxy +include $(srcdir)/preinstall.am include $(top_srcdir)/automake/subdirs.am include $(top_srcdir)/automake/local.am diff --git a/cpukit/ftpd/Makefile.am b/cpukit/ftpd/Makefile.am index f43c2e9dcb..db53ecace8 100644 --- a/cpukit/ftpd/Makefile.am +++ b/cpukit/ftpd/Makefile.am @@ -4,9 +4,6 @@ include $(top_srcdir)/automake/compile.am -CLEANFILES = -DISTCLEANFILES = - if HAS_NETWORKING project_lib_LIBRARIES = libftpd.a libftpd_a_SOURCES = ftpd.c ftpd.h @@ -15,5 +12,4 @@ 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 210ade7c9c..8cbd0ea5ea 100644 --- a/cpukit/httpd/Makefile.am +++ b/cpukit/httpd/Makefile.am @@ -4,9 +4,6 @@ include $(top_srcdir)/automake/compile.am -CLEANFILES = -DISTCLEANFILES = - AM_CPPFLAGS += -DWEBS -DUEMF if HAS_NETWORKING @@ -31,5 +28,4 @@ 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 8da0e9def8..53d2b3296d 100644 --- a/cpukit/itron/Makefile.am +++ b/cpukit/itron/Makefile.am @@ -6,8 +6,6 @@ include $(top_srcdir)/automake/multilib.am include $(top_srcdir)/automake/compile.am EXTRA_DIST = -CLEANFILES = -DISTCLEANFILES = if HAS_ITRON ## include @@ -120,5 +118,4 @@ 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/libcsupport/Makefile.am b/cpukit/libcsupport/Makefile.am index c1a2e58229..c01e30cfc0 100644 --- a/cpukit/libcsupport/Makefile.am +++ b/cpukit/libcsupport/Makefile.am @@ -5,9 +5,6 @@ include $(top_srcdir)/automake/multilib.am include $(top_srcdir)/automake/compile.am -CLEANFILES = -DISTCLEANFILES = - noinst_LIBRARIES = libcsupport.a libcsupport_a_CPPFLAGS = $(AM_CPPFLAGS) @@ -98,5 +95,4 @@ 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/libi2c/Makefile.am b/cpukit/libi2c/Makefile.am index c17b4cd6dd..c422529bc8 100644 --- a/cpukit/libi2c/Makefile.am +++ b/cpukit/libi2c/Makefile.am @@ -8,8 +8,4 @@ noinst_LIBRARIES = libi2c.a libi2c_a_SOURCES = libi2c.c libi2c.h -## --- - -all-local: $(PREINSTALL_FILES) - include $(top_srcdir)/automake/local.am diff --git a/cpukit/librpc/Makefile.am b/cpukit/librpc/Makefile.am index 2dcd7cc259..83859c99f3 100644 --- a/cpukit/librpc/Makefile.am +++ b/cpukit/librpc/Makefile.am @@ -6,8 +6,6 @@ include $(top_srcdir)/automake/multilib.am include $(top_srcdir)/automake/compile.am EXTRA_DIST = -CLEANFILES = -DISTCLEANFILES = if LIBRPC include_rpcdir = $(includedir)/rpc @@ -92,5 +90,4 @@ EXTRA_DIST += include/rpcsvc/bootparam_prot.x include/rpcsvc/crypt.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 bf4cef4992..4ca195baf5 100644 --- a/cpukit/posix/Makefile.am +++ b/cpukit/posix/Makefile.am @@ -6,8 +6,6 @@ include $(top_srcdir)/automake/multilib.am include $(top_srcdir)/automake/compile.am EXTRA_DIST = -CLEANFILES = -DISTCLEANFILES = if HAS_POSIX @@ -169,5 +167,4 @@ 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 b14c3f6d5d..dc9f8a06ec 100644 --- a/cpukit/pppd/Makefile.am +++ b/cpukit/pppd/Makefile.am @@ -19,9 +19,5 @@ endif all-local: $(PREINSTALL_FILES) $(TMPINSTALL_FILES) -CLEANFILES = -DISTCLEANFILES = - include $(srcdir)/preinstall.am - include $(top_srcdir)/automake/local.am diff --git a/cpukit/rtems/Makefile.am b/cpukit/rtems/Makefile.am index 9486bedefb..cca99b1e3c 100644 --- a/cpukit/rtems/Makefile.am +++ b/cpukit/rtems/Makefile.am @@ -5,9 +5,6 @@ include $(top_srcdir)/automake/multilib.am include $(top_srcdir)/automake/compile.am -CLEANFILES = -DISTCLEANFILES = - AM_CPPFLAGS += -D__RTEMS_INSIDE__ noinst_LIBRARIES = librtems.a @@ -130,5 +127,4 @@ 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 233d8f3dae..56373a5299 100644 --- a/cpukit/sapi/Makefile.am +++ b/cpukit/sapi/Makefile.am @@ -5,9 +5,6 @@ include $(top_srcdir)/automake/multilib.am include $(top_srcdir)/automake/compile.am -CLEANFILES = -DISTCLEANFILES = - include_rtemsdir = $(includedir)/rtems include_rtems_HEADERS = include/confdefs.h @@ -35,5 +32,4 @@ 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 30e6394843..604a8c26cb 100644 --- a/cpukit/score/Makefile.am +++ b/cpukit/score/Makefile.am @@ -5,9 +5,6 @@ include $(top_srcdir)/automake/multilib.am include $(top_srcdir)/automake/compile.am -CLEANFILES = -DISTCLEANFILES = - SUBDIRS = . cpu ## include @@ -156,11 +153,10 @@ libscore_a_CPPFLAGS = $(AM_CPPFLAGS) EXTRA_DIST += $(STD_C_FILES) $(MP_C_FILES) src/Unlimited.txt -DISTCLEANFILES += include/rtems/score/cpuopts.h +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 5db0330dbe..6b5c429b37 100644 --- a/cpukit/score/cpu/arm/Makefile.am +++ b/cpukit/score/cpu/arm/Makefile.am @@ -4,9 +4,6 @@ include $(top_srcdir)/automake/compile.am -CLEANFILES = -DISTCLEANFILES = - include_rtemsdir = $(includedir)/rtems include_rtems_HEADERS = rtems/asm.h @@ -21,5 +18,4 @@ 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 f552c539b5..9a83e2e614 100644 --- a/cpukit/score/cpu/avr/Makefile.am +++ b/cpukit/score/cpu/avr/Makefile.am @@ -4,9 +4,6 @@ include $(top_srcdir)/automake/compile.am -CLEANFILES = -DISTCLEANFILES = - include_rtemsdir = $(includedir)/rtems include_rtems_HEADERS = rtems/asm.h @@ -21,5 +18,4 @@ 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 b35e78766d..e924d8a0e9 100644 --- a/cpukit/score/cpu/c4x/Makefile.am +++ b/cpukit/score/cpu/c4x/Makefile.am @@ -4,9 +4,6 @@ include $(top_srcdir)/automake/compile.am -CLEANFILES = -DISTCLEANFILES = - include_rtemsdir = $(includedir)/rtems include_rtems_HEADERS = rtems/asm.h @@ -24,5 +21,4 @@ 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 5f275ca108..1ca2e64608 100644 --- a/cpukit/score/cpu/h8300/Makefile.am +++ b/cpukit/score/cpu/h8300/Makefile.am @@ -4,9 +4,6 @@ include $(top_srcdir)/automake/compile.am -CLEANFILES = -DISTCLEANFILES = - include_rtemsdir = $(includedir)/rtems include_rtems_HEADERS = rtems/asm.h @@ -21,5 +18,4 @@ 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 a838c84154..b7a13d64ff 100644 --- a/cpukit/score/cpu/i386/Makefile.am +++ b/cpukit/score/cpu/i386/Makefile.am @@ -4,9 +4,6 @@ include $(top_srcdir)/automake/compile.am -CLEANFILES = -DISTCLEANFILES = - include_rtemsdir = $(includedir)/rtems include_rtems_HEADERS= rtems/asm.h @@ -22,5 +19,4 @@ 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 e739e45542..46bb6a19f0 100644 --- a/cpukit/score/cpu/m68k/Makefile.am +++ b/cpukit/score/cpu/m68k/Makefile.am @@ -4,9 +4,6 @@ include $(top_srcdir)/automake/compile.am -CLEANFILES = -DISTCLEANFILES = - noinst_LIBRARIES = libscorecpu.a libscorecpu_a_CPPFLAGS = $(AM_CPPFLAGS) @@ -26,5 +23,4 @@ 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 74954e6190..5a4dad6ba8 100644 --- a/cpukit/score/cpu/mips/Makefile.am +++ b/cpukit/score/cpu/mips/Makefile.am @@ -4,9 +4,6 @@ include $(top_srcdir)/automake/compile.am -CLEANFILES = -DISTCLEANFILES = - include_rtemsdir = $(includedir)/rtems include_rtems_HEADERS = rtems/asm.h @@ -24,5 +21,4 @@ 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 561f4f48d2..18189d141d 100644 --- a/cpukit/score/cpu/no_cpu/Makefile.am +++ b/cpukit/score/cpu/no_cpu/Makefile.am @@ -4,9 +4,6 @@ include $(top_srcdir)/automake/compile.am -CLEANFILES = -DISTCLEANFILES = - include_rtemsdir = $(includedir)/rtems include_rtems_HEADERS = rtems/asm.h @@ -21,5 +18,4 @@ 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 7ce820ccae..fb10b52771 100644 --- a/cpukit/score/cpu/powerpc/Makefile.am +++ b/cpukit/score/cpu/powerpc/Makefile.am @@ -4,9 +4,6 @@ include $(top_srcdir)/automake/compile.am -CLEANFILES = -DISTCLEANFILES = - include_rtemsdir = $(includedir)/rtems include_rtems_HEADERS = rtems/asm.h @@ -33,5 +30,4 @@ 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 74f06703a6..29f9e14644 100644 --- a/cpukit/score/cpu/sh/Makefile.am +++ b/cpukit/score/cpu/sh/Makefile.am @@ -4,9 +4,6 @@ include $(top_srcdir)/automake/compile.am -CLEANFILES = -DISTCLEANFILES = - include_rtemsdir = $(includedir)/rtems include_rtems_HEADERS = rtems/asm.h @@ -21,5 +18,4 @@ 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 1292dd9ee5..2d648f8b18 100644 --- a/cpukit/score/cpu/sparc/Makefile.am +++ b/cpukit/score/cpu/sparc/Makefile.am @@ -4,9 +4,6 @@ include $(top_srcdir)/automake/compile.am -CLEANFILES = -DISTCLEANFILES = - include_rtemsdir = $(includedir)/rtems include_rtems_HEADERS = rtems/asm.h @@ -21,5 +18,4 @@ 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 541ebe9549..bb99bf5326 100644 --- a/cpukit/score/cpu/unix/Makefile.am +++ b/cpukit/score/cpu/unix/Makefile.am @@ -4,9 +4,6 @@ include $(top_srcdir)/automake/compile.am -CLEANFILES = -DISTCLEANFILES = - AM_CPPFLAGS += -DCPU_SYNC_IO include_rtemsdir = $(includedir)/rtems @@ -23,5 +20,4 @@ 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 3ea736cfd3..2b027dfbf3 100644 --- a/cpukit/telnetd/Makefile.am +++ b/cpukit/telnetd/Makefile.am @@ -4,9 +4,6 @@ include $(top_srcdir)/automake/compile.am -CLEANFILES = -DISTCLEANFILES = - if HAS_NETWORKING if LIBSHELL include_rtemsdir = $(includedir)/rtems @@ -23,5 +20,4 @@ EXTRA_DIST = README all-local: $(PREINSTALL_FILES) $(TMPINSTALL_FILES) include $(srcdir)/preinstall.am - include $(top_srcdir)/automake/local.am diff --git a/cpukit/wrapup/Makefile.am b/cpukit/wrapup/Makefile.am index 97f0e5f908..1ff4a1d3af 100644 --- a/cpukit/wrapup/Makefile.am +++ b/cpukit/wrapup/Makefile.am @@ -10,8 +10,6 @@ ARCH = o-optimize project_lib_LIBRARIES = librtemscpu.a librtemscpu_a_SOURCES = -CLEANFILES = -DISTCLEANFILES = TMP_LIBS = TMP_LIBS += ../score/cpu/@RTEMS_CPU@/libscorecpu.a @@ -104,5 +102,4 @@ librtemscpu.a: $(TMP_LIBS) all-local: $(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 808f07c8a2..bdda067908 100644 --- a/cpukit/zlib/Makefile.am +++ b/cpukit/zlib/Makefile.am @@ -4,9 +4,6 @@ include $(top_srcdir)/automake/compile.am -CLEANFILES = -DISTCLEANFILES = - project_lib_LIBRARIES = libz.a libz_a_SOURCES = adler32.c @@ -30,5 +27,4 @@ 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