diff options
| author | Ralf Corsepius <ralf.corsepius@rtems.org> | 2003-09-29 14:11:26 +0000 |
|---|---|---|
| committer | Ralf Corsepius <ralf.corsepius@rtems.org> | 2003-09-29 14:11:26 +0000 |
| commit | 2821666fa1d31c1fc6f65690a0bc57618d9f4a81 (patch) | |
| tree | e13d8b9e6f35569eb3e900a1c4940a7895d4ee6b /c/src/lib/libbsp/m68k/mvme162 | |
| parent | 2003-09-29 Ralf Corsepius <corsepiu@faw.uni-ulm.de> (diff) | |
| download | rtems-2821666fa1d31c1fc6f65690a0bc57618d9f4a81.tar.bz2 | |
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.
Diffstat (limited to 'c/src/lib/libbsp/m68k/mvme162')
| -rw-r--r-- | c/src/lib/libbsp/m68k/mvme162/ChangeLog | 7 | ||||
| -rw-r--r-- | c/src/lib/libbsp/m68k/mvme162/Makefile.am | 12 | ||||
| -rw-r--r-- | c/src/lib/libbsp/m68k/mvme162/configure.ac | 1 | ||||
| -rw-r--r-- | c/src/lib/libbsp/m68k/mvme162/include/Makefile.am | 23 |
4 files changed, 17 insertions, 26 deletions
diff --git a/c/src/lib/libbsp/m68k/mvme162/ChangeLog b/c/src/lib/libbsp/m68k/mvme162/ChangeLog index b3b348d409..0e591ab173 100644 --- a/c/src/lib/libbsp/m68k/mvme162/ChangeLog +++ b/c/src/lib/libbsp/m68k/mvme162/ChangeLog @@ -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:. diff --git a/c/src/lib/libbsp/m68k/mvme162/Makefile.am b/c/src/lib/libbsp/m68k/mvme162/Makefile.am index 2c55209d1c..e600576604 100644 --- a/c/src/lib/libbsp/m68k/mvme162/Makefile.am +++ b/c/src/lib/libbsp/m68k/mvme162/Makefile.am @@ -14,11 +14,19 @@ 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 start startup clock console timer tod network wrapup tools +SUBDIRS = . start startup clock console timer tod network wrapup tools include $(top_srcdir)/../../bsp.am -EXTRA_DIST = bsp_specs times +include_HEADERS += include/coverhd.h +include_HEADERS += include/page_table.h +include_HEADERS += include/tod.h + +nodist_include_HEADERS += $(top_srcdir)/../shared/mvme/include/mvme16x_hw.h + +all-local: $(PREINSTALL_FILES) + +EXTRA_DIST = times include $(top_srcdir)/../../../../automake/subdirs.am include $(top_srcdir)/../../../../automake/local.am diff --git a/c/src/lib/libbsp/m68k/mvme162/configure.ac b/c/src/lib/libbsp/m68k/mvme162/configure.ac index d6e3277cf0..d416ce08d9 100644 --- a/c/src/lib/libbsp/m68k/mvme162/configure.ac +++ b/c/src/lib/libbsp/m68k/mvme162/configure.ac @@ -24,7 +24,6 @@ AM_CONDITIONAL(HAS_NETWORKING,test "$HAS_NETWORKING" = "yes") AC_CONFIG_FILES([Makefile clock/Makefile console/Makefile -include/Makefile network/Makefile start/Makefile startup/Makefile diff --git a/c/src/lib/libbsp/m68k/mvme162/include/Makefile.am b/c/src/lib/libbsp/m68k/mvme162/include/Makefile.am deleted file mode 100644 index 18d19ddfd8..0000000000 --- a/c/src/lib/libbsp/m68k/mvme162/include/Makefile.am +++ /dev/null @@ -1,23 +0,0 @@ -## -## $Id$ -## - - -include_HEADERS = bsp.h coverhd.h mvme16x_hw.h page_table.h tod.h bspopts.h - -$(PROJECT_INCLUDE): - $(mkinstalldirs) $@ - -$(PROJECT_INCLUDE)/%.h: %.h - $(INSTALL_DATA) $< $@ - -mvme16x_hw.h: $(srcdir)/../../shared/mvme/mvme16x_hw.h - cp $< $@ -CLEANFILES = mvme16x_hw.h - -TMPINSTALL_FILES = $(PROJECT_INCLUDE) \ - $(include_HEADERS:%=$(PROJECT_INCLUDE)/%) - -all-local: $(TMPINSTALL_FILES) - -include $(top_srcdir)/../../../../automake/local.am |