From 63ae87612da91339a32ceecd218546a469d45b4a Mon Sep 17 00:00:00 2001 From: Ralf Corsepius Date: Wed, 21 Jan 2004 06:50:10 +0000 Subject: 2004-01-21 Ralf Corsepius * clock/Makefile.am, timer/Makefile.am: Remove. * r46xx/Makefile.am: Built timer.rel, clock.rel. Add PREINSTALL_DIRS. * Makefile.am: Remove timer, clock. * tx39/Makefile.am, mongoosev/Makefile.am, shared/Makefile.am: Add PREINSTALL_DIRS. * configure.ac: Reflect removing clock/Makefile.am, timer/Makefile.am. Add subdir-objects to AUTOMAKE_OPTIONS. --- c/src/lib/libcpu/mips/ChangeLog | 12 +++++++++++ c/src/lib/libcpu/mips/Makefile.am | 2 +- c/src/lib/libcpu/mips/clock/Makefile.am | 28 ------------------------- c/src/lib/libcpu/mips/configure.ac | 4 +--- c/src/lib/libcpu/mips/mongoosev/Makefile.am | 6 ++++-- c/src/lib/libcpu/mips/r46xx/Makefile.am | 32 +++++++++++++++++++++++++++++ c/src/lib/libcpu/mips/shared/Makefile.am | 4 +++- c/src/lib/libcpu/mips/timer/Makefile.am | 28 ------------------------- c/src/lib/libcpu/mips/tx39/Makefile.am | 4 +++- 9 files changed, 56 insertions(+), 64 deletions(-) delete mode 100644 c/src/lib/libcpu/mips/clock/Makefile.am delete mode 100644 c/src/lib/libcpu/mips/timer/Makefile.am (limited to 'c/src/lib/libcpu') diff --git a/c/src/lib/libcpu/mips/ChangeLog b/c/src/lib/libcpu/mips/ChangeLog index 8a064256ef..099d27df23 100644 --- a/c/src/lib/libcpu/mips/ChangeLog +++ b/c/src/lib/libcpu/mips/ChangeLog @@ -1,3 +1,15 @@ +2004-01-21 Ralf Corsepius + + * clock/Makefile.am, timer/Makefile.am: Remove. + * r46xx/Makefile.am: Built timer.rel, clock.rel. + Add PREINSTALL_DIRS. + * Makefile.am: Remove timer, clock. + * tx39/Makefile.am, mongoosev/Makefile.am, shared/Makefile.am: + Add PREINSTALL_DIRS. + * configure.ac: Reflect removing clock/Makefile.am, + timer/Makefile.am. + Add subdir-objects to AUTOMAKE_OPTIONS. + 2004-01-18 Ralf Corsepius * clock/Makefile.am: Convert to using automake compilation rules. diff --git a/c/src/lib/libcpu/mips/Makefile.am b/c/src/lib/libcpu/mips/Makefile.am index 9460e8d36f..4fe6da9381 100644 --- a/c/src/lib/libcpu/mips/Makefile.am +++ b/c/src/lib/libcpu/mips/Makefile.am @@ -4,7 +4,7 @@ ACLOCAL_AMFLAGS = -I ../../../aclocal -SUBDIRS = shared mongoosev tx39 clock timer r46xx +SUBDIRS = shared mongoosev tx39 r46xx include $(top_srcdir)/../../../automake/subdirs.am include $(top_srcdir)/../../../automake/local.am diff --git a/c/src/lib/libcpu/mips/clock/Makefile.am b/c/src/lib/libcpu/mips/clock/Makefile.am deleted file mode 100644 index 712e1dce8d..0000000000 --- a/c/src/lib/libcpu/mips/clock/Makefile.am +++ /dev/null @@ -1,28 +0,0 @@ -## -## $Id$ -## - -EXTRA_PROGRAMS = -CLEANFILES = -noinst_DATA = - -include $(top_srcdir)/../../../automake/compile.am -include $(top_srcdir)/../../../automake/lib.am - -if r46xx -EXTRA_PROGRAMS += clock.rel -CLEANFILES += clock.rel -clock_rel_SOURCES = ckinit.c clock.S clock.h -clock_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V) -clock_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) - -EXTRA_PROGRAMS += clock_g.rel -CLEANFILES += clock_g.rel -clock_g_rel_SOURCES = $(clock_rel_SOURCES) -clock_g_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V) -clock_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) - -noinst_DATA += clock$(LIB_VARIANT).rel -endif - -include $(top_srcdir)/../../../automake/local.am diff --git a/c/src/lib/libcpu/mips/configure.ac b/c/src/lib/libcpu/mips/configure.ac index 4fdc80282e..184f856129 100644 --- a/c/src/lib/libcpu/mips/configure.ac +++ b/c/src/lib/libcpu/mips/configure.ac @@ -9,7 +9,7 @@ RTEMS_TOP(../../../../..) RTEMS_CANONICAL_TARGET_CPU -AM_INIT_AUTOMAKE([no-define foreign 1.8]) +AM_INIT_AUTOMAKE([no-define foreign subdir-objects 1.8.2]) AM_MAINTAINER_MODE RTEMS_ENABLE_BARE @@ -33,11 +33,9 @@ AM_CONDITIONAL(mongoosev, test "$RTEMS_CPU_MODEL" = "mongoosev") # Explicitly list all Makefiles here AC_CONFIG_FILES([Makefile -clock/Makefile mongoosev/Makefile shared/Makefile r46xx/Makefile -timer/Makefile tx39/Makefile ]) AC_OUTPUT diff --git a/c/src/lib/libcpu/mips/mongoosev/Makefile.am b/c/src/lib/libcpu/mips/mongoosev/Makefile.am index 9c3fb721b5..900e5d8c25 100644 --- a/c/src/lib/libcpu/mips/mongoosev/Makefile.am +++ b/c/src/lib/libcpu/mips/mongoosev/Makefile.am @@ -55,13 +55,14 @@ endif all-local: $(PREINSTALL_FILES) +PREINSTALL_DIRS = PREINSTALL_FILES = if mongoosev $(PROJECT_INCLUDE)/libcpu/$(dirstamp): @$(mkdir_p) $(PROJECT_INCLUDE)/libcpu @: > $(PROJECT_INCLUDE)/libcpu/$(dirstamp) -PREINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu/$(dirstamp) +PREINSTALL_DIRS += $(PROJECT_INCLUDE)/libcpu/$(dirstamp) $(PROJECT_INCLUDE)/libcpu/mongoose-v.h: include/mongoose-v.h $(PROJECT_INCLUDE)/libcpu/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libcpu/mongoose-v.h @@ -70,7 +71,7 @@ PREINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu/mongoose-v.h $(PROJECT_INCLUDE)/libchip/$(dirstamp): @$(mkdir_p) $(PROJECT_INCLUDE)/libchip @: > $(PROJECT_INCLUDE)/libchip/$(dirstamp) -PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/$(dirstamp) +PREINSTALL_DIRS += $(PROJECT_INCLUDE)/libchip/$(dirstamp) $(PROJECT_INCLUDE)/libchip/mg5uart.h: duart/mg5uart.h $(PROJECT_INCLUDE)/libchip/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/mg5uart.h @@ -78,5 +79,6 @@ PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/mg5uart.h endif CLEANFILES += $(PREINSTALL_FILES) +DISTCLEANFILES = $(PREINSTALL_DIRS) include $(top_srcdir)/../../../automake/local.am diff --git a/c/src/lib/libcpu/mips/r46xx/Makefile.am b/c/src/lib/libcpu/mips/r46xx/Makefile.am index ef846f03d2..c91d14250d 100644 --- a/c/src/lib/libcpu/mips/r46xx/Makefile.am +++ b/c/src/lib/libcpu/mips/r46xx/Makefile.am @@ -27,4 +27,36 @@ vectorisrs_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) noinst_DATA += vectorisrs$(LIB_VARIANT).rel endif +if r46xx +EXTRA_PROGRAMS += timer.rel +CLEANFILES += timer.rel +timer_rel_SOURCES = ../timer/timer.c ../timer/gettime.S +timer_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V) +timer_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) + +EXTRA_PROGRAMS += timer_g.rel +CLEANFILES += timer_g.rel +timer_g_rel_SOURCES = $(timer_rel_SOURCES) +timer_g_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V) +timer_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) + +noinst_DATA += timer$(LIB_VARIANT).rel +endif + +if r46xx +EXTRA_PROGRAMS += clock.rel +CLEANFILES += clock.rel +clock_rel_SOURCES = ../clock/ckinit.c ../clock/clock.S ../clock/clock.h +clock_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V) +clock_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) + +EXTRA_PROGRAMS += clock_g.rel +CLEANFILES += clock_g.rel +clock_g_rel_SOURCES = $(clock_rel_SOURCES) +clock_g_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V) +clock_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) + +noinst_DATA += clock$(LIB_VARIANT).rel +endif + include $(top_srcdir)/../../../automake/local.am diff --git a/c/src/lib/libcpu/mips/shared/Makefile.am b/c/src/lib/libcpu/mips/shared/Makefile.am index 84450ab8ee..4ea46ded97 100644 --- a/c/src/lib/libcpu/mips/shared/Makefile.am +++ b/c/src/lib/libcpu/mips/shared/Makefile.am @@ -61,17 +61,19 @@ all-local: $(PREINSTALL_FILES) ## -- +PREINSTALL_DIRS = PREINSTALL_FILES = $(PROJECT_INCLUDE)/libcpu/$(dirstamp): @$(mkdir_p) $(PROJECT_INCLUDE)/libcpu @: > $(PROJECT_INCLUDE)/libcpu/$(dirstamp) -PREINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu/$(dirstamp) +PREINSTALL_DIRS += $(PROJECT_INCLUDE)/libcpu/$(dirstamp) $(PROJECT_INCLUDE)/libcpu/cache.h: ../../shared/include/cache.h $(PROJECT_INCLUDE)/libcpu/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libcpu/cache.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu/cache.h CLEANFILES += $(PREINSTALL_FILES) +DISTCLEANFILES = $(PREINSTALL_DIRS) include $(top_srcdir)/../../../automake/local.am diff --git a/c/src/lib/libcpu/mips/timer/Makefile.am b/c/src/lib/libcpu/mips/timer/Makefile.am deleted file mode 100644 index 8965634d1c..0000000000 --- a/c/src/lib/libcpu/mips/timer/Makefile.am +++ /dev/null @@ -1,28 +0,0 @@ -## -## $Id$ -## - -EXTRA_PROGRAMS = -CLEANFILES = -noinst_DATA = - -include $(top_srcdir)/../../../automake/compile.am -include $(top_srcdir)/../../../automake/lib.am - -if r46xx -EXTRA_PROGRAMS += timer.rel -CLEANFILES += timer.rel -timer_rel_SOURCES = timer.c gettime.S -timer_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V) -timer_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) - -EXTRA_PROGRAMS += timer_g.rel -CLEANFILES += timer_g.rel -timer_g_rel_SOURCES = $(timer_rel_SOURCES) -timer_g_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V) -timer_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) - -noinst_DATA += timer$(LIB_VARIANT).rel -endif - -include $(top_srcdir)/../../../automake/local.am diff --git a/c/src/lib/libcpu/mips/tx39/Makefile.am b/c/src/lib/libcpu/mips/tx39/Makefile.am index 9211c676a7..e459497f4c 100644 --- a/c/src/lib/libcpu/mips/tx39/Makefile.am +++ b/c/src/lib/libcpu/mips/tx39/Makefile.am @@ -32,13 +32,14 @@ endif all-local: $(PREINSTALL_FILES) +PREINSTALL_DIRS = PREINSTALL_FILES = if tx39 $(PROJECT_INCLUDE)/libcpu/$(dirstamp): @$(mkdir_p) $(PROJECT_INCLUDE)/libcpu @: > $(PROJECT_INCLUDE)/libcpu/$(dirstamp) -PREINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu/$(dirstamp) +PREINSTALL_DIRS += $(PROJECT_INCLUDE)/libcpu/$(dirstamp) $(PROJECT_INCLUDE)/libcpu/tx3904.h: include/tx3904.h $(PROJECT_INCLUDE)/libcpu/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libcpu/tx3904.h @@ -46,5 +47,6 @@ PREINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu/tx3904.h endif CLEANFILES += $(PREINSTALL_FILES) +DISTCLEANFILES = $(PREINSTALL_DIRS) include $(top_srcdir)/../../../automake/local.am -- cgit v1.2.3