diff options
author | Ralf Corsepius <ralf.corsepius@rtems.org> | 2003-12-09 14:21:06 +0000 |
---|---|---|
committer | Ralf Corsepius <ralf.corsepius@rtems.org> | 2003-12-09 14:21:06 +0000 |
commit | 1da3d0b5ac27d8053630e3a75c396d3bb94c0315 (patch) | |
tree | f35f41cfe6820f12bd77d7e6ca1f6b67d64eb249 /c | |
parent | 2003-12-09 Ralf Corsepius <corsepiu@faw.uni-ulm.de> (diff) | |
download | rtems-1da3d0b5ac27d8053630e3a75c396d3bb94c0315.tar.bz2 |
2003-12-09 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* network/Makefile.am: Misc cleanups and fixes.
* start/Makefile.am: Misc cleanups and fixes.
* startup/Makefile.am: Misc cleanups and fixes.
* wrapup/Makefile.am: Misc cleanups and fixes.
Diffstat (limited to 'c')
-rw-r--r-- | c/src/lib/libbsp/arm/edb7312/ChangeLog | 7 | ||||
-rw-r--r-- | c/src/lib/libbsp/arm/edb7312/network/Makefile.am | 4 | ||||
-rw-r--r-- | c/src/lib/libbsp/arm/edb7312/start/Makefile.am | 18 | ||||
-rw-r--r-- | c/src/lib/libbsp/arm/edb7312/startup/Makefile.am | 14 | ||||
-rw-r--r-- | c/src/lib/libbsp/arm/edb7312/wrapup/Makefile.am | 13 |
5 files changed, 26 insertions, 30 deletions
diff --git a/c/src/lib/libbsp/arm/edb7312/ChangeLog b/c/src/lib/libbsp/arm/edb7312/ChangeLog index f8316189c1..b9f721dddc 100644 --- a/c/src/lib/libbsp/arm/edb7312/ChangeLog +++ b/c/src/lib/libbsp/arm/edb7312/ChangeLog @@ -1,3 +1,10 @@ +2003-12-09 Ralf Corsepius <corsepiu@faw.uni-ulm.de> + + * network/Makefile.am: Misc cleanups and fixes. + * start/Makefile.am: Misc cleanups and fixes. + * startup/Makefile.am: Misc cleanups and fixes. + * wrapup/Makefile.am: Misc cleanups and fixes. + 2003-12-03 Ralf Corsepius <corsepiu@faw.uni-ulm.de> * Makefile.am: Add preinstallation dirstamp support. diff --git a/c/src/lib/libbsp/arm/edb7312/network/Makefile.am b/c/src/lib/libbsp/arm/edb7312/network/Makefile.am index e5f3447942..2a39dd2a98 100644 --- a/c/src/lib/libbsp/arm/edb7312/network/Makefile.am +++ b/c/src/lib/libbsp/arm/edb7312/network/Makefile.am @@ -4,7 +4,7 @@ PGM = $(ARCH)/network.rel -C_FILES = network.c +C_FILES = network.c C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.o) OBJS = $(C_O_FILES) @@ -28,6 +28,6 @@ endif .PRECIOUS: $(PGM) -EXTRA_DIST = network.c +EXTRA_DIST = network.c include $(top_srcdir)/../../../../automake/local.am diff --git a/c/src/lib/libbsp/arm/edb7312/start/Makefile.am b/c/src/lib/libbsp/arm/edb7312/start/Makefile.am index b0dad9e6dc..59ca0d971f 100644 --- a/c/src/lib/libbsp/arm/edb7312/start/Makefile.am +++ b/c/src/lib/libbsp/arm/edb7312/start/Makefile.am @@ -11,24 +11,20 @@ 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 += # -install-data-local: $(PROJECT_RELEASE)/lib/start$(LIB_VARIANT).$(OBJEXT) - @$(mkinstalldirs) $(DESTDIR)$(bsplibdir) - $(INSTALL_DATA) $< $(DESTDIR)$(bsplibdir) +project_lib_DATA = $(ARCH)/start$(LIB_VARIANT).$(OBJEXT) -$(PROJECT_RELEASE)/lib/start$(LIB_VARIANT).$(OBJEXT): $(ARCH)/start.$(OBJEXT) - $(INSTALL_DATA) $< $@ - -TMPINSTALL_FILES += $(PROJECT_RELEASE)/lib/start$(LIB_VARIANT).$(OBJEXT) - -all-local: $(OBJS) $(ARCH)/start.$(OBJEXT) $(TMPINSTALL_FILES) - -.PRECIOUS: $(ARCH)/start.$(OBJEXT) +all-local: $(TMPINSTALL_FILES) EXTRA_DIST = start.S +${PROJECT_RELEASE}/lib/start$(LIB_VARIANT).$(OBJEXT): $(ARCH)/start$(LIB_VARIANT).$(OBJEXT) ${PROJECT_RELEASE}/lib/$(dirstamp) + $(INSTALL_DATA) $< ${PROJECT_RELEASE}/lib/start$(LIB_VARIANT).$(OBJEXT) +TMPINSTALL_FILES += ${PROJECT_RELEASE}/lib/start$(LIB_VARIANT).$(OBJEXT) + include $(top_srcdir)/../../../../automake/local.am diff --git a/c/src/lib/libbsp/arm/edb7312/startup/Makefile.am b/c/src/lib/libbsp/arm/edb7312/startup/Makefile.am index 961a2a5245..ba14850193 100644 --- a/c/src/lib/libbsp/arm/edb7312/startup/Makefile.am +++ b/c/src/lib/libbsp/arm/edb7312/startup/Makefile.am @@ -20,18 +20,16 @@ include $(top_srcdir)/../../../../automake/lib.am $(PGM): $(OBJS) $(make-rel) -bsplib_DATA = linkcmds - -$(PROJECT_RELEASE)/lib/linkcmds: linkcmds - $(INSTALL_DATA) $< $@ +project_lib_DATA = linkcmds # the .rel file built here will be put into libbsp.a by ../wrapup/Makefile -TMPINSTALL_FILES += $(PROJECT_RELEASE)/lib/linkcmds - -all-local: $(OBJS) $(PGM) $(TMPINSTALL_FILES) -.PRECIOUS: $(PGM) +all-local: $(PGM) $(TMPINSTALL_FILES) EXTRA_DIST = bspstart.c exit.c linkcmds +${PROJECT_RELEASE}/lib/linkcmds: linkcmds ${PROJECT_RELEASE}/lib/$(dirstamp) + $(INSTALL_DATA) $< ${PROJECT_RELEASE}/lib/linkcmds +TMPINSTALL_FILES += ${PROJECT_RELEASE}/lib/linkcmds + include $(top_srcdir)/../../../../automake/local.am diff --git a/c/src/lib/libbsp/arm/edb7312/wrapup/Makefile.am b/c/src/lib/libbsp/arm/edb7312/wrapup/Makefile.am index 4463017b75..66f649a759 100644 --- a/c/src/lib/libbsp/arm/edb7312/wrapup/Makefile.am +++ b/c/src/lib/libbsp/arm/edb7312/wrapup/Makefile.am @@ -5,9 +5,9 @@ BSP_FILES = clock console startup irq timer network start # bummer; have to use $foreach since % pattern subst rules only replace 1x -OBJS = $(foreach piece, $(BSP_FILES), $(wildcard \ - ../$(piece)/$(ARCH)/*.$(OBJEXT))) $(wildcard \ - ../../../../libcpu/$(RTEMS_CPU)/shared/*/$(ARCH)/*.$(OBJEXT)) $(wildcard \ +OBJS = $(foreach piece, $(BSP_FILES), ../$(piece)/$(ARCH)/*.$(OBJEXT)) \ + $(wildcard ../../../../libcpu/$(RTEMS_CPU)/shared/*/$(ARCH)/*.$(OBJEXT)) \ + $(wildcard \ ../../../../libcpu/$(RTEMS_CPU)/$(RTEMS_CPU_MODEL)/*/$(ARCH)/*.$(OBJEXT)) LIB = $(ARCH)/libbsp.a @@ -21,11 +21,6 @@ include $(top_srcdir)/../../../../automake/lib.am $(LIB): ${OBJS} $(make-library) -$(PROJECT_RELEASE)/lib/libbsp$(LIB_VARIANT).a: $(LIB) - $(INSTALL_DATA) $< $@ - -TMPINSTALL_FILES += $(PROJECT_RELEASE)/lib/libbsp$(LIB_VARIANT).a - -all-local: $(TMPINSTALL_FILES) +all-local: $(LIB) include $(top_srcdir)/../../../../automake/local.am |