diff options
| author | Ralf Corsepius <ralf.corsepius@rtems.org> | 2003-01-20 16:34:19 +0000 |
|---|---|---|
| committer | Ralf Corsepius <ralf.corsepius@rtems.org> | 2003-01-20 16:34:19 +0000 |
| commit | 4eef8f79f8562d592dc2cf0327a08a55bbb347d2 (patch) | |
| tree | 8dbf8d30e998d2b5952ad85a34118f9523bc4321 /c/src/lib/libcpu | |
| parent | 2003-01-20 Ralf Corsepius <corsepiu@faw.uni-ulm.de> (diff) | |
| download | rtems-4eef8f79f8562d592dc2cf0327a08a55bbb347d2.tar.bz2 | |
2003-01-20 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* Makefile.am: Merge-in include/Makefile.am.
* include/Makefile.am: Removed.
* configure.ac: Reflect changes above.
Diffstat (limited to 'c/src/lib/libcpu')
| -rw-r--r-- | c/src/lib/libcpu/i960/ChangeLog | 6 | ||||
| -rw-r--r-- | c/src/lib/libcpu/i960/Makefile.am | 18 | ||||
| -rw-r--r-- | c/src/lib/libcpu/i960/configure.ac | 3 | ||||
| -rw-r--r-- | c/src/lib/libcpu/i960/include/Makefile.am | 23 |
4 files changed, 24 insertions, 26 deletions
diff --git a/c/src/lib/libcpu/i960/ChangeLog b/c/src/lib/libcpu/i960/ChangeLog index f771b99a1e..1dc9fa606b 100644 --- a/c/src/lib/libcpu/i960/ChangeLog +++ b/c/src/lib/libcpu/i960/ChangeLog @@ -1,3 +1,9 @@ +2003-01-20 Ralf Corsepius <corsepiu@faw.uni-ulm.de> + + * Makefile.am: Merge-in include/Makefile.am. + * include/Makefile.am: Removed. + * configure.ac: Reflect changes above. + 2002-12-16 Ralf Corsepius <corsepiu@faw.uni-ulm.de> * Makefile.am: Remove CPU_MODEL_SUBDIR. diff --git a/c/src/lib/libcpu/i960/Makefile.am b/c/src/lib/libcpu/i960/Makefile.am index 99af625698..47a459186e 100644 --- a/c/src/lib/libcpu/i960/Makefile.am +++ b/c/src/lib/libcpu/i960/Makefile.am @@ -4,7 +4,23 @@ ACLOCAL_AMFLAGS = -I ../../../../../aclocal -SUBDIRS = include i960ca i960ka i960rp +SUBDIRS = . i960ca i960ka i960rp + +include_libcpudir = $(includedir)/libcpu + +include_libcpu_HEADERS = include/i960CA.h include/i960HA.h include/i960KA.h \ + include/i960RP.h include/i960JX_RP_common.h + +$(PROJECT_INCLUDE)/libcpu: + $(mkinstalldirs) $@ + +$(PROJECT_INCLUDE)/libcpu/%.h: include/%.h + $(INSTALL_DATA) $< $@ + +TMPINSTALL_FILES = $(PROJECT_INCLUDE)/libcpu \ + $(include_libcpu_HEADERS:include/%.h=$(PROJECT_INCLUDE)/libcpu/%) + +all-local: $(TMPINSTALL_FILES) include $(top_srcdir)/../../../../../automake/subdirs.am include $(top_srcdir)/../../../../../automake/local.am diff --git a/c/src/lib/libcpu/i960/configure.ac b/c/src/lib/libcpu/i960/configure.ac index 03fbcc26a6..7571d01885 100644 --- a/c/src/lib/libcpu/i960/configure.ac +++ b/c/src/lib/libcpu/i960/configure.ac @@ -32,7 +32,6 @@ AM_CONDITIONAL(i960rp, test "$RTEMS_CPU_MODEL" = "i960rp") AC_CONFIG_FILES([Makefile i960ca/Makefile i960ka/Makefile -i960rp/Makefile -include/Makefile]) +i960rp/Makefile]) AC_OUTPUT diff --git a/c/src/lib/libcpu/i960/include/Makefile.am b/c/src/lib/libcpu/i960/include/Makefile.am deleted file mode 100644 index bd0ff88ebc..0000000000 --- a/c/src/lib/libcpu/i960/include/Makefile.am +++ /dev/null @@ -1,23 +0,0 @@ -## -## $Id$ -## - - -include_libcpudir = $(includedir)/libcpu - -include_libcpu_HEADERS = i960CA.h i960HA.h i960KA.h i960RP.h i960JX_RP_common.h - -$(PROJECT_INCLUDE)/libcpu: - $(mkinstalldirs) $@ - -$(PROJECT_INCLUDE)/libcpu/%.h: %.h - $(INSTALL_DATA) $< $@ - -TMPINSTALL_FILES = $(PROJECT_INCLUDE)/libcpu \ - $(include_libcpu_HEADERS:%=$(PROJECT_INCLUDE)/libcpu/%) - -all-local: $(TMPINSTALL_FILES) - -EXTRA_DIST = i960CA.h i960HA.h i960KA.h i960RP.h i960JX_RP_common.h - -include $(top_srcdir)/../../../../../automake/local.am |