diff options
author | Ralf Corsepius <ralf.corsepius@rtems.org> | 2004-01-07 03:34:37 +0000 |
---|---|---|
committer | Ralf Corsepius <ralf.corsepius@rtems.org> | 2004-01-07 03:34:37 +0000 |
commit | 65cf99c753ad6f7f25d1079868d29811900ea303 (patch) | |
tree | e1594760469c5d2dae7125b689de104297655022 /c/src/lib/libbsp/m68k/mrm332 | |
parent | 2004-01-06 Ralf Corsepius <corsepiu@faw.uni-ulm.de> (diff) | |
download | rtems-65cf99c753ad6f7f25d1079868d29811900ea303.tar.bz2 |
2004-01-07 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* start/Makefile.am: Remove.
* Makefile.am: Merge-in start/Makefile.am.
* configure.ac: Reflect changes above.
Diffstat (limited to 'c/src/lib/libbsp/m68k/mrm332')
-rw-r--r-- | c/src/lib/libbsp/m68k/mrm332/ChangeLog | 6 | ||||
-rw-r--r-- | c/src/lib/libbsp/m68k/mrm332/Makefile.am | 23 | ||||
-rw-r--r-- | c/src/lib/libbsp/m68k/mrm332/configure.ac | 1 | ||||
-rw-r--r-- | c/src/lib/libbsp/m68k/mrm332/start/Makefile.am | 32 |
4 files changed, 24 insertions, 38 deletions
diff --git a/c/src/lib/libbsp/m68k/mrm332/ChangeLog b/c/src/lib/libbsp/m68k/mrm332/ChangeLog index d1ef4d698d..e3b39286d3 100644 --- a/c/src/lib/libbsp/m68k/mrm332/ChangeLog +++ b/c/src/lib/libbsp/m68k/mrm332/ChangeLog @@ -1,3 +1,9 @@ +2004-01-07 Ralf Corsepius <corsepiu@faw.uni-ulm.de> + + * start/Makefile.am: Remove. + * Makefile.am: Merge-in start/Makefile.am. + * configure.ac: Reflect changes above. + 2004-01-05 Ralf Corsepius <corsepiu@faw.uni-ulm.de> * wrapup/Makefile.am: Eliminate $(LIB). diff --git a/c/src/lib/libbsp/m68k/mrm332/Makefile.am b/c/src/lib/libbsp/m68k/mrm332/Makefile.am index c534772b35..44700b31c2 100644 --- a/c/src/lib/libbsp/m68k/mrm332/Makefile.am +++ b/c/src/lib/libbsp/m68k/mrm332/Makefile.am @@ -4,19 +4,28 @@ ACLOCAL_AMFLAGS = -I ../../../../aclocal +include $(top_srcdir)/../../../../automake/compile.am +include $(top_srcdir)/../../bsp.am + # wrapup is the one that actually builds and installs the library # from the individual .rel files built in other directories -SUBDIRS = . start startup clock console spurious timer wrapup - -include $(top_srcdir)/../../bsp.am +SUBDIRS = . startup clock console spurious timer wrapup include_HEADERS += include/mrm332.h nodist_include_HEADERS += $(top_srcdir)/../../shared/include/coverhd.h -all-local: $(PREIINSTALL_FILES) - EXTRA_DIST = times +S_FILES = start/start.S +$(ARCH)/%$(LIB_VARIANT).$(OBJEXT): start/start.S $(ARCH)/$(dirstamp) + $(CCASCOMPILE) -DASM -o $@ -c $< + +project_lib_DATA = $(ARCH)/start$(LIB_VARIANT).$(OBJEXT) + +all-local: $(PREINSTALL_FILES) $(TMPINSTALL_FILES) + +TMPINSTALL_FILES = + $(PROJECT_INCLUDE)/mrm332.h: include/mrm332.h $(PROJECT_INCLUDE)/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/mrm332.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/mrm332.h @@ -25,5 +34,9 @@ $(PROJECT_INCLUDE)/coverhd.h: $(top_srcdir)/../../shared/include/coverhd.h $(PRO $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/coverhd.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/coverhd.h +$(PROJECT_LIB)/start$(LIB_VARIANT).$(OBJEXT): $(ARCH)/start$(LIB_VARIANT).$(OBJEXT) $(PROJECT_LIB)/$(dirstamp) + $(INSTALL_DATA) $< $(PROJECT_LIB)/start$(LIB_VARIANT).$(OBJEXT) +TMPINSTALL_FILES += $(PROJECT_LIB)/start$(LIB_VARIANT).$(OBJEXT) + include $(top_srcdir)/../../../../automake/subdirs.am include $(top_srcdir)/../../../../automake/local.am diff --git a/c/src/lib/libbsp/m68k/mrm332/configure.ac b/c/src/lib/libbsp/m68k/mrm332/configure.ac index 7f5df3efcc..6b5139b9c0 100644 --- a/c/src/lib/libbsp/m68k/mrm332/configure.ac +++ b/c/src/lib/libbsp/m68k/mrm332/configure.ac @@ -19,7 +19,6 @@ AC_CONFIG_FILES([Makefile clock/Makefile console/Makefile spurious/Makefile -start/Makefile startup/Makefile timer/Makefile wrapup/Makefile]) diff --git a/c/src/lib/libbsp/m68k/mrm332/start/Makefile.am b/c/src/lib/libbsp/m68k/mrm332/start/Makefile.am deleted file mode 100644 index 01a0f84051..0000000000 --- a/c/src/lib/libbsp/m68k/mrm332/start/Makefile.am +++ /dev/null @@ -1,32 +0,0 @@ -## -## $Id$ -## - -S_FILES = start.S -S_O_FILES = $(S_FILES:%.S=$(ARCH)/%.$(OBJEXT)) - -OBJS = $(S_O_FILES) - -include $(top_srcdir)/../../../../automake/compile.am -include $(top_srcdir)/../../../../automake/lib.am -include $(top_srcdir)/../../bspstart.am - -# -# (OPTIONAL) Add local stuff here using += -# - -project_lib_DATA = $(ARCH)/start$(LIB_VARIANT).$(OBJEXT) - -all-local: $(TMPINSTALL_FILES) - -EXTRA_DIST = start.S - -$(PROJECT_LIB)/$(dirstamp): - @$(mkdir_p) $(PROJECT_LIB) - @: > $(PROJECT_LIB)/$(dirstamp) - -$(PROJECT_LIB)/start$(LIB_VARIANT).$(OBJEXT): $(ARCH)/start$(LIB_VARIANT).$(OBJEXT) $(PROJECT_LIB)/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_LIB)/start$(LIB_VARIANT).$(OBJEXT) -TMPINSTALL_FILES += $(PROJECT_LIB)/start$(LIB_VARIANT).$(OBJEXT) - -include $(top_srcdir)/../../../../automake/local.am |