diff options
author | Ralf Corsepius <ralf.corsepius@rtems.org> | 2004-01-06 23:49:14 +0000 |
---|---|---|
committer | Ralf Corsepius <ralf.corsepius@rtems.org> | 2004-01-06 23:49:14 +0000 |
commit | 2850606f8eec8494819422d43c072f759df42f69 (patch) | |
tree | bbfc9e9c0977eca853db7869fa618c8c19e96459 /c/src | |
parent | 2004-01-06 Ralf Corsepius <corsepiu@faw.uni-ulm.de> (diff) | |
download | rtems-2850606f8eec8494819422d43c072f759df42f69.tar.bz2 |
2004-01-06 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')
-rw-r--r-- | c/src/lib/libbsp/m68k/idp/ChangeLog | 6 | ||||
-rw-r--r-- | c/src/lib/libbsp/m68k/idp/Makefile.am | 21 | ||||
-rw-r--r-- | c/src/lib/libbsp/m68k/idp/start/.cvsignore | 2 | ||||
-rw-r--r-- | c/src/lib/libbsp/m68k/idp/start/Makefile.am | 32 |
4 files changed, 23 insertions, 38 deletions
diff --git a/c/src/lib/libbsp/m68k/idp/ChangeLog b/c/src/lib/libbsp/m68k/idp/ChangeLog index d015269d90..879125ed62 100644 --- a/c/src/lib/libbsp/m68k/idp/ChangeLog +++ b/c/src/lib/libbsp/m68k/idp/ChangeLog @@ -1,3 +1,9 @@ +2004-01-06 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/idp/Makefile.am b/c/src/lib/libbsp/m68k/idp/Makefile.am index e5805b0b94..fed1d199e9 100644 --- a/c/src/lib/libbsp/m68k/idp/Makefile.am +++ b/c/src/lib/libbsp/m68k/idp/Makefile.am @@ -4,20 +4,29 @@ 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 timer wrapup - -include $(top_srcdir)/../../bsp.am +SUBDIRS = . startup clock console timer wrapup include_HEADERS += include/leds.h nodist_include_HEADERS += $(top_srcdir)/../../shared/include/coverhd.h -all-local: $(PREINSTALL_FILES) +m68k_shared_S_FILES = $(top_srcdir)/../../m68k/shared/start.S +$(ARCH)/%$(LIB_VARIANT).$(OBJEXT): $(top_srcdir)/../../m68k/shared/start.S $(ARCH)/$(dirstamp) + ${CCASCOMPILE} -DASM -o $@ -c $< + +project_lib_DATA = $(ARCH)/start$(LIB_VARIANT).$(OBJEXT) + +all-local: $(PREINSTALL_FILES) $(TMPINSTALL_FILES) EXTRA_DIST = include/README EXTRA_DIST += times +TMPINSTALL_FILES = + $(PROJECT_INCLUDE)/leds.h: include/leds.h $(PROJECT_INCLUDE)/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/leds.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/leds.h @@ -26,5 +35,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/idp/start/.cvsignore b/c/src/lib/libbsp/m68k/idp/start/.cvsignore deleted file mode 100644 index 282522db03..0000000000 --- a/c/src/lib/libbsp/m68k/idp/start/.cvsignore +++ /dev/null @@ -1,2 +0,0 @@ -Makefile -Makefile.in diff --git a/c/src/lib/libbsp/m68k/idp/start/Makefile.am b/c/src/lib/libbsp/m68k/idp/start/Makefile.am deleted file mode 100644 index 992dd4f24d..0000000000 --- a/c/src/lib/libbsp/m68k/idp/start/Makefile.am +++ /dev/null @@ -1,32 +0,0 @@ -## -## $Id$ -## - -VPATH = @srcdir@:@srcdir@/../../shared - -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) - -$(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 |