RTOS/rtems
1
0
Fork 0
forked from Imagelibrary/rtems
Code Pull Requests Activity

2003-01-20 Ralf Corsepius <corsepiu@faw.uni-ulm.de>

Browse Source 
* Makefile.am: Merge-in include/Makefile.am.
	* include/Makefile.am: Removed.
	* configure.ac: Reflect changes above.
This commit is contained in:
Ralf Corsepius
2003-01-20 16:34:19 +00:00
parent 159efe9f56
commit 4eef8f79f8
4 changed files with 24 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
c/src/lib/libcpu/i960/ChangeLog
View File

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

18
c/src/lib/libcpu/i960/Makefile.am
View File

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

3
c/src/lib/libcpu/i960/configure.ac
View File

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

23
c/src/lib/libcpu/i960/include/Makefile.am
View File

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