2004-01-14 Ralf Corsepius <corsepiu@faw.uni-ulm.de>

* start/.cvsignore: Remove.
	* 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-14 01:30:31 +00:00
parent ae60724872
commit 2d86d78f96
5 changed files with 22 additions and 39 deletions

View File

@@ -1,3 +1,10 @@
2004-01-14 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* start/.cvsignore: Remove.
* 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,6 +4,9 @@
ACLOCAL_AMFLAGS = -I ../../../../aclocal
include $(top_srcdir)/../../../../automake/compile.am
include $(top_srcdir)/../../bsp.am
# consolex is a predecessor of the termios and libchip concepts.
# It is no longer being compiled into the source.
# The MVME162 has 2 z8530's to yield four serial ports.
@@ -14,9 +17,7 @@ ACLOCAL_AMFLAGS = -I ../../../../aclocal
# 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 tod network wrapup tools
include $(top_srcdir)/../../bsp.am
SUBDIRS = . startup clock console timer tod network wrapup tools
include_HEADERS += include/coverhd.h
include_HEADERS += include/page_table.h
@@ -24,7 +25,13 @@ include_HEADERS += include/tod.h
nodist_include_HEADERS += $(top_srcdir)/../shared/mvme/mvme16x_hw.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 = times
@@ -44,5 +51,9 @@ $(PROJECT_INCLUDE)/mvme16x_hw.h: $(top_srcdir)/../shared/mvme/mvme16x_hw.h $(PRO
$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/mvme16x_hw.h
PREINSTALL_FILES += $(PROJECT_INCLUDE)/mvme16x_hw.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

@@ -25,7 +25,6 @@ AC_CONFIG_FILES([Makefile
clock/Makefile
console/Makefile
network/Makefile
start/Makefile
startup/Makefile
timer/Makefile
tod/Makefile

View File

@@ -1,2 +0,0 @@
Makefile
Makefile.in

View File

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