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.
This commit is contained in:
Ralf Corsepius
2004-01-07 03:48:45 +00:00
parent 65cf99c753
commit 68be514d86
4 changed files with 24 additions and 34 deletions

View File

@@ -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).

View File

@@ -4,21 +4,30 @@
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
nodist_include_HEADERS += $(top_srcdir)/../../shared/include/coverhd.h
include_HEADERS += include/efi68k.h
include_HEADERS += include/16550.h
include_HEADERS += include/DP8570A.h
all-local: $(PREINSTALL_FILES)
EXTRA_DIST = times
C_FILES = start/start.C
$(ARCH)/%$(LIB_VARIANT).$(OBJEXT): start/start.c $(ARCH)/$(dirstamp)
$(COMPILE) -o $@ -c $<
project_lib_DATA = $(ARCH)/start$(LIB_VARIANT).$(OBJEXT)
all-local: $(PREINSTALL_FILES) $(TMPINSTALL_FILES)
TMPINSTALL_FILES =
$(PROJECT_INCLUDE)/coverhd.h: $(top_srcdir)/../../shared/include/coverhd.h $(PROJECT_INCLUDE)/$(dirstamp)
$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/coverhd.h
PREINSTALL_FILES += $(PROJECT_INCLUDE)/coverhd.h
@@ -35,5 +44,9 @@ $(PROJECT_INCLUDE)/DP8570A.h: include/DP8570A.h $(PROJECT_INCLUDE)/$(dirstamp)
$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/DP8570A.h
PREINSTALL_FILES += $(PROJECT_INCLUDE)/DP8570A.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

View File

@@ -19,7 +19,6 @@ AC_CONFIG_FILES([Makefile
clock/Makefile
console/Makefile
spurious/Makefile
start/Makefile
startup/Makefile
timer/Makefile
wrapup/Makefile])

View File

@@ -1,28 +0,0 @@
##
## $Id$
##
C_FILES = start.c
C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT))
OBJS = $(C_O_FILES)
include $(top_srcdir)/../../../../automake/compile.am
include $(top_srcdir)/../../../../automake/lib.am
include $(top_srcdir)/../../bspstart.am
project_lib_DATA = $(ARCH)/start$(LIB_VARIANT).$(OBJEXT)
all-local: $(TMPINSTALL_FILES)
EXTRA_DIST = start.c
$(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