2004-01-05 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-05 06:37:25 +00:00
parent 6411947601
commit 356d53f700
8 changed files with 46 additions and 76 deletions

View File

@@ -1,3 +1,9 @@
2004-01-05 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,20 +4,28 @@
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 gnatsupp console clock timer erc32sonic wrapup \
tools
include $(top_srcdir)/../../bsp.am
SUBDIRS = . startup gnatsupp console clock timer erc32sonic wrapup tools
include_HEADERS += include/erc32.h
include_HEADERS += include/coverhd.h
all-local: $(PREINSTALL_FILES)
sparc_shared_S_FILES = $(top_srcdir)/../../sparc/shared/start.S
$(ARCH)/%$(LIB_VARIANT).$(OBJEXT): $(top_srcdir)/../../sparc/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
TMPINSTALL_FILES =
$(PROJECT_INCLUDE)/erc32.h: include/erc32.h $(PROJECT_INCLUDE)/$(dirstamp)
$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/erc32.h
PREINSTALL_FILES += $(PROJECT_INCLUDE)/erc32.h
@@ -26,5 +34,9 @@ $(PROJECT_INCLUDE)/coverhd.h: include/coverhd.h $(PROJECT_INCLUDE)/$(dirstamp)
$(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

View File

@@ -42,7 +42,6 @@ clock/Makefile
console/Makefile
erc32sonic/Makefile
gnatsupp/Makefile
start/Makefile
startup/Makefile
timer/Makefile
wrapup/Makefile])

View File

@@ -1,32 +0,0 @@
##
## $Id$
##
S_FILES = $(top_srcdir)/../shared/start.S
S_O_FILES = $(S_FILES:$(top_srcdir)/../shared/%.S=$(ARCH)/%.$(OBJEXT))
OBJS = $(S_O_FILES)
include $(top_srcdir)/../../../../automake/compile.am
include $(top_srcdir)/../../../../automake/lib.am
#
# (OPTIONAL) Add local stuff here using +=
#
project_lib_DATA = $(ARCH)/start$(LIB_VARIANT).$(OBJEXT)
$(ARCH)/%$(LIB_VARIANT).$(OBJEXT): $(top_srcdir)/../shared/%.S $(ARCH)/$(dirstamp)
${CCASCOMPILE} -DASM -o $@ -c $<
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

View File

@@ -1,3 +1,9 @@
2004-01-05 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,20 +4,28 @@
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 gnatsupp console clock timer leon_open_eth wrapup \
tools
include $(top_srcdir)/../../bsp.am
SUBDIRS = . startup gnatsupp console clock timer leon_open_eth wrapup tools
include_HEADERS += include/leon.h
include_HEADERS += include/coverhd.h
all-local: $(PREINSTALL_FILES)
sparc_shared_S_FILES = $(top_srcdir)/../../sparc/shared/start.S
$(ARCH)/%$(LIB_VARIANT).$(OBJEXT): $(top_srcdir)/../../sparc/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
TMPINSTALL_FILES =
$(PROJECT_INCLUDE)/leon.h: include/leon.h $(PROJECT_INCLUDE)/$(dirstamp)
$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/leon.h
PREINSTALL_FILES += $(PROJECT_INCLUDE)/leon.h
@@ -26,5 +34,9 @@ $(PROJECT_INCLUDE)/coverhd.h: include/coverhd.h $(PROJECT_INCLUDE)/$(dirstamp)
$(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

View File

@@ -42,7 +42,6 @@ clock/Makefile
console/Makefile
leon_open_eth/Makefile
gnatsupp/Makefile
start/Makefile
startup/Makefile
timer/Makefile
wrapup/Makefile])

View File

@@ -1,32 +0,0 @@
##
## $Id$
##
S_FILES = $(top_srcdir)/../shared/start.S
S_O_FILES = $(S_FILES:$(top_srcdir)/../shared/%.S=$(ARCH)/%.$(OBJEXT))
OBJS = $(S_O_FILES)
include $(top_srcdir)/../../../../automake/compile.am
include $(top_srcdir)/../../../../automake/lib.am
#
# (OPTIONAL) Add local stuff here using +=
#
project_lib_DATA = $(ARCH)/start$(LIB_VARIANT).$(OBJEXT)
$(ARCH)/%$(LIB_VARIANT).$(OBJEXT): $(top_srcdir)/../shared/%.S $(ARCH)/$(dirstamp)
${CCASCOMPILE} -DASM -o $@ -c $<
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