2003-12-09 Ralf Corsepius <corsepiu@faw.uni-ulm.de>

* start/Makefile.am: Misc cleanups and fixes.
	* startup/Makefile.am: Misc cleanups and fixes.
	* wrapup/Makefile.am: Misc cleanups and fixes.
This commit is contained in:
Ralf Corsepius
2003-12-09 14:15:48 +00:00
parent ebcdbb6a15
commit ae31530b99
8 changed files with 40 additions and 38 deletions

View File

@@ -1,3 +1,9 @@
2003-12-09 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* start/Makefile.am: Misc cleanups and fixes.
* startup/Makefile.am: Misc cleanups and fixes.
* wrapup/Makefile.am: Misc cleanups and fixes.
2003-12-02 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* Makefile.am: Add preinstallation dirstamp support.

View File

@@ -11,22 +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) $(TMPINSTALL_FILES)
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

View File

@@ -26,19 +26,16 @@ include $(top_srcdir)/../../../../automake/lib.am
$(PGM): $(startup_rel_OBJECTS)
$(make-rel)
bsplib_DATA = linkcmds
$(PROJECT_RELEASE)/lib/linkcmds: linkcmds
$(INSTALL_DATA) $< $@
project_lib_DATA = linkcmds
UNUSED_C_FILES = setvec.c
TMPINSTALL_FILES += $(PROJECT_RELEASE)/lib/linkcmds
all-local: $(startup_rel_OBJECTS) $(PGM) $(TMPINSTALL_FILES)
.PRECIOUS: $(PGM)
EXTRA_DIST = README bspstart.c linkcmds setvec.c
${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

View File

@@ -11,8 +11,8 @@ endif
BSP_FILES = startup clock console timer $(NETWORK)
# bummer; have to use $foreach since % pattern subst rules only replace 1x
OBJS = $(foreach piece, $(BSP_FILES), $(wildcard \
../$(piece)/$(ARCH)/*.$(OBJEXT))) $(wildcard \
OBJS = $(foreach piece, $(BSP_FILES), ../$(piece)/$(ARCH)/*.$(OBJEXT)) \
$(wildcard \
../../../../libcpu/i386/$(ARCH)/*.$(OBJEXT))
LIB = $(ARCH)/libbsp.a

View File

@@ -1,3 +1,9 @@
2003-12-09 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* start/Makefile.am: Misc cleanups and fixes.
* startup/Makefile.am: Misc cleanups and fixes.
* wrapup/Makefile.am: Misc cleanups and fixes.
2003-12-02 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* Makefile.am: Add preinstallation dirstamp support.

View File

@@ -11,22 +11,20 @@ noinst_FILES = 80386ex.h
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) $(TMPINSTALL_FILES)
all-local: $(TMPINSTALL_FILES)
EXTRA_DIST = 80386ex.h 80386ex.inc macros.inc start.S ts_1325.inc
${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

View File

@@ -26,19 +26,16 @@ include $(top_srcdir)/../../../../automake/lib.am
$(PGM): $(startup_rel_OBJECTS)
$(make-rel)
bsplib_DATA = linkcmds
$(PROJECT_RELEASE)/lib/linkcmds: linkcmds
$(INSTALL_DATA) $< $@
project_lib_DATA = linkcmds
UNUSED_C_FILES = setvec.c
TMPINSTALL_FILES += $(PROJECT_RELEASE)/lib/linkcmds
all-local: $(startup_rel_OBJECTS) $(PGM) $(TMPINSTALL_FILES)
.PRECIOUS: $(PGM)
EXTRA_DIST = README bspstart.c linkcmds setvec.c
${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

View File

@@ -11,8 +11,8 @@ endif
BSP_FILES = startup clock console timer $(NETWORK)
# bummer; have to use $foreach since % pattern subst rules only replace 1x
OBJS = $(foreach piece, $(BSP_FILES), $(wildcard \
../$(piece)/$(ARCH)/*.$(OBJEXT))) $(wildcard \
OBJS = $(foreach piece, $(BSP_FILES), ../$(piece)/$(ARCH)/*.$(OBJEXT)) \
$(wildcard \
../../../../libcpu/i386/$(ARCH)/*.$(OBJEXT))
LIB = $(ARCH)/libbsp.a