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

* Makefile.am: Merge-in include/Makefile.am.
	Reflect changes to bsp.am.
	* include/Makefile.am: Remove.
	* configure.ac: Reflect changes above.
This commit is contained in:
Ralf Corsepius
2003-09-29 12:23:14 +00:00
parent 602610f636
commit a692823e78
12 changed files with 91 additions and 89 deletions

View File

@@ -1,3 +1,10 @@
2003-09-29 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* Makefile.am: Merge-in include/Makefile.am.
Reflect changes to bsp.am.
* include/Makefile.am: Remove.
* configure.ac: Reflect changes above.
2003-09-19 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* bsp_specs: Remove *lib:.

View File

@@ -5,13 +5,31 @@
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 = include clock console startup start timer scv64 tod sonic \
@exceptions@ wrapup
# from the individual .rel files built in other directories
SUBDIRS = . clock console startup start timer scv64 tod sonic @exceptions@ \
wrapup
include $(top_srcdir)/../../bsp.am
EXTRA_DIST = QUIRKS README.net STATUS bsp_specs cable.doc times
include_HEADERS += include/dmv170.h
nodist_include_HEADERS += $(top_srcdir)/../../shared/tod.h
nodist_include_HEADERS += $(top_srcdir)/../../shared/include/coverhd.h
all-local: $(PREINSTALL_FILES)
EXTRA_DIST = QUIRKS README.net STATUS cable.doc times
$(PROJECT_INCLUDE)/dmv170.h: include/dmv170.h
$(INSTALL_DATA) $< $@
PREINSTALL_FILES += $(PROJECT_INCLUDE)/dmv170.h
$(PROJECT_INCLUDE)/tod.h: $(top_srcdir)/../../shared/tod.h
$(INSTALL_DATA) $< $@
PREINSTALL_FILES += $(PROJECT_INCLUDE)/tod.h
$(PROJECT_INCLUDE)/coverhd.h: $(top_srcdir)/../../shared/include/coverhd.h
$(INSTALL_DATA) $< $@
PREINSTALL_FILES += $(PROJECT_INCLUDE)/coverhd.h
include $(top_srcdir)/../../../../automake/subdirs.am
include $(top_srcdir)/../../../../automake/local.am

View File

@@ -50,7 +50,6 @@ RTEMS_BSPOPTS_HELP([DMV177_USE_INSTRUCTION_CACHE],
AC_CONFIG_FILES([Makefile
clock/Makefile
console/Makefile
include/Makefile
scv64/Makefile
sonic/Makefile
start/Makefile

View File

@@ -1,26 +0,0 @@
##
## $Id$
##
include_HEADERS = bsp.h coverhd.h dmv170.h tod.h bspopts.h
tod.h: $(top_srcdir)/../../shared/tod.h
cp $< $@
coverhd.h: $(top_srcdir)/../../shared/include/coverhd.h
cp $< $@
CLEANFILES = tod.h coverhd.h
$(PROJECT_INCLUDE):
$(mkinstalldirs) $@
$(PROJECT_INCLUDE)/%.h: %.h
$(INSTALL_DATA) $< $@
TMPINSTALL_FILES = $(PROJECT_INCLUDE) \
$(include_HEADERS:%=$(PROJECT_INCLUDE)/%)
all-local: $(TMPINSTALL_FILES)
include $(top_srcdir)/../../../../automake/force-preinstall.am
include $(top_srcdir)/../../../../automake/local.am

View File

@@ -1,3 +1,10 @@
2003-09-29 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* Makefile.am: Merge-in include/Makefile.am.
Reflect changes to bsp.am.
* include/Makefile.am: Remove.
* configure.ac: Reflect changes above.
2003-09-19 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* bsp_specs: Remove *lib:.

View File

@@ -5,13 +5,47 @@
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 = clock include startup start canbus console irq network vectors \
# from the individual .rel files built in other directories
SUBDIRS = . clock startup start canbus console irq network vectors \
@exceptions@ wrapup
include $(top_srcdir)/../../bsp.am
EXTRA_DIST = bsp_specs times
include_bspdir = $(includedir)/bsp
include_HEADERS += include/coverhd.h
include_HEADERS += include/canbus.h
include_HEADERS += include/info.h
include_bsp_HEADERS = include/commproc.h
include_bsp_HEADERS += include/8xx_immap.h
all-local: $(PREINSTALL_FILES)
EXTRA_DIST = times
$(PROJECT_INCLUDE)/bsp:
@$(mkinstalldirs) $(PROJECT_INCLUDE)/bsp
PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp
$(PROJECT_INCLUDE)/bsp/commproc.h: include/commproc.h
$(INSTALL_DATA) $< $@
PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/commproc.h
$(PROJECT_INCLUDE)/bsp/8xx_immap.h: include/8xx_immap.h
$(INSTALL_DATA) $< $@
PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/8xx_immap.h
$(PROJECT_INCLUDE)/coverhd.h: include/coverhd.h
$(INSTALL_DATA) $< $@
PREINSTALL_FILES += $(PROJECT_INCLUDE)/coverhd.h
$(PROJECT_INCLUDE)/canbus.h: include/canbus.h
$(INSTALL_DATA) $< $@
PREINSTALL_FILES += $(PROJECT_INCLUDE)/canbus.h
$(PROJECT_INCLUDE)/info.h: include/info.h
$(INSTALL_DATA) $< $@
PREINSTALL_FILES += $(PROJECT_INCLUDE)/info.h
include $(top_srcdir)/../../../../automake/subdirs.am
include $(top_srcdir)/../../../../automake/local.am

View File

@@ -41,7 +41,6 @@ AC_CONFIG_FILES([Makefile
clock/Makefile
canbus/Makefile
console/Makefile
include/Makefile
irq/Makefile
network/Makefile
start/Makefile

View File

@@ -1,30 +0,0 @@
##
## $Id$
##
include_bspdir = $(includedir)/bsp
include_HEADERS = bsp.h coverhd.h canbus.h info.h bspopts.h
include_bsp_HEADERS = commproc.h 8xx_immap.h
$(PROJECT_INCLUDE):
$(mkinstalldirs) $@
$(PROJECT_INCLUDE)/bsp:
$(mkinstalldirs) $@
$(PROJECT_INCLUDE)/%.h: %.h
$(INSTALL_DATA) $< $@
$(PROJECT_INCLUDE)/bsp/%.h : %.h
$(INSTALL_DATA) $< $@
TMPINSTALL_FILES = $(PROJECT_INCLUDE) $(PROJECT_INCLUDE)/bsp \
$(include_HEADERS:%=$(PROJECT_INCLUDE)/%) \
$(include_bsp_HEADERS:%=$(PROJECT_INCLUDE)/bsp/%)
all-local: $(TMPINSTALL_FILES)
include $(top_srcdir)/../../../../automake/force-preinstall.am
include $(top_srcdir)/../../../../automake/local.am

View File

@@ -1,3 +1,10 @@
2003-09-29 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* Makefile.am: Merge-in include/Makefile.am.
Reflect changes to bsp.am.
* include/Makefile.am: Remove.
* configure.ac: Reflect changes above.
2003-09-19 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* bsp_specs: Remove *lib:.

View File

@@ -5,12 +5,20 @@
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 = include dlentry startup @exceptions@ wrapup
# from the individual .rel files built in other directories
SUBDIRS = . dlentry startup @exceptions@ wrapup
include $(top_srcdir)/../../bsp.am
EXTRA_DIST = bsp_specs times
include_HEADERS += include/coverhd.h
all-local: $(PREINSTALL_FILES)
EXTRA_DIST = times
$(PROJECT_INCLUDE)/coverhd.h: include/coverhd.h
$(INSTALL_DATA) $< $@
PREINSTALL_FILES += $(PROJECT_INCLUDE)/coverhd.h
include $(top_srcdir)/../../../../automake/subdirs.am
include $(top_srcdir)/../../../../automake/local.am

View File

@@ -34,7 +34,6 @@ RTEMS_BSPOPTS_HELP([PPC_VECTOR_FILE_BASE],
# Explicitly list all Makefiles here
AC_CONFIG_FILES([Makefile
dlentry/Makefile
include/Makefile
startup/Makefile
wrapup/Makefile])

View File

@@ -1,20 +0,0 @@
##
## $Id$
##
include_HEADERS = bsp.h coverhd.h bspopts.h
$(PROJECT_INCLUDE):
$(mkinstalldirs) $@
$(PROJECT_INCLUDE)/%.h: %.h
$(INSTALL_DATA) $< $@
TMPINSTALL_FILES = $(PROJECT_INCLUDE) \
$(include_HEADERS:%=$(PROJECT_INCLUDE)/%)
all-local: $(TMPINSTALL_FILES)
include $(top_srcdir)/../../../../automake/force-preinstall.am
include $(top_srcdir)/../../../../automake/local.am