2003-10-23 Ralf Corsepius <corsepiu@faw.uni-ulm.de>

* mongoosev/Makefile.am: Rework preinstall rules.
	* mongoosev/duart/Makefile.am: Rework preinstall rules.
	* tx39/include/Makefile.am: Remove.
	* tx39/Makefile.am: Merge-in tx39/include/Makefile.am.
	* configure.ac: Remove tx39/include/Makefile.
This commit is contained in:
Ralf Corsepius
2003-10-23 13:55:49 +00:00
parent eb3ca32d9a
commit 1b4a37ad58
6 changed files with 47 additions and 47 deletions

View File

@@ -1,3 +1,11 @@
2003-10-23 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* mongoosev/Makefile.am: Rework preinstall rules.
* mongoosev/duart/Makefile.am: Rework preinstall rules.
* tx39/include/Makefile.am: Remove.
* tx39/Makefile.am: Merge-in tx39/include/Makefile.am.
* configure.ac: Remove tx39/include/Makefile.
2003-10-22 Ralf Corsepius <corsepiu@faw.uni-ulm.de> 2003-10-22 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* configure.ac: Remove RTEMS_CANONICAL_HOST. * configure.ac: Remove RTEMS_CANONICAL_HOST.

View File

@@ -15,7 +15,6 @@ AM_MAINTAINER_MODE
RTEMS_ENABLE_BARE RTEMS_ENABLE_BARE
RTEMS_ENV_RTEMSBSP RTEMS_ENV_RTEMSBSP
RTEMS_PROJECT_ROOT RTEMS_PROJECT_ROOT
RTEMS_PROG_CC_FOR_TARGET RTEMS_PROG_CC_FOR_TARGET
@@ -44,7 +43,6 @@ r46xx/Makefile
r46xx/vectorisrs/Makefile r46xx/vectorisrs/Makefile
timer/Makefile timer/Makefile
tx39/Makefile tx39/Makefile
tx39/include/Makefile
tx39/vectorisrs/Makefile tx39/vectorisrs/Makefile
]) ])
AC_OUTPUT AC_OUTPUT

View File

@@ -9,16 +9,17 @@ SUBDIRS = duart vectorisrs
include_mipsdir = $(includedir)/libcpu include_mipsdir = $(includedir)/libcpu
include_mips_HEADERS = include/mongoose-v.h include_mips_HEADERS = include/mongoose-v.h
$(PROJECT_INCLUDE)/libcpu:
$(mkinstalldirs) $@
$(PROJECT_INCLUDE)/libcpu/%.h: include/%.h
$(INSTALL_DATA) $< $@
PREINSTALL_FILES = $(PROJECT_INCLUDE)/libcpu \
$(include_mips_HEADERS:include/%.h=$(PROJECT_INCLUDE)/libcpu/%.h)
all-local: $(PREINSTALL_FILES) all-local: $(PREINSTALL_FILES)
PREINSTALL_FILES =
$(PROJECT_INCLUDE)/libcpu:
@$(mkinstalldirs) $(PROJECT_INCLUDE)/libcpu
PREINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu
$(PROJECT_INCLUDE)/libcpu/mongoose-v.h: include/mongoose-v.h
$(INSTALL_DATA) $< $@
PREINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu/mongoose-v.h
include $(top_srcdir)/../../../automake/subdirs.am include $(top_srcdir)/../../../automake/subdirs.am
include $(top_srcdir)/../../../automake/local.am include $(top_srcdir)/../../../automake/local.am

View File

@@ -2,7 +2,6 @@
## $Id$ ## $Id$
## ##
PGM = $(ARCH)/mg5uart.rel PGM = $(ARCH)/mg5uart.rel
C_FILES = mg5uart.c mg5uart_reg.c C_FILES = mg5uart.c mg5uart_reg.c
@@ -12,11 +11,6 @@ mg5uart_rel_OBJECTS = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT))
include $(top_srcdir)/../../../automake/compile.am include $(top_srcdir)/../../../automake/compile.am
include $(top_srcdir)/../../../automake/lib.am include $(top_srcdir)/../../../automake/lib.am
$(PROJECT_INCLUDE)/libchip:
@$(mkinstalldirs) $@
$(PROJECT_INCLUDE)/libchip/%.h: %.h
$(INSTALL_DATA) $< $@
# #
# (OPTIONAL) Add local stuff here using += # (OPTIONAL) Add local stuff here using +=
# #
@@ -24,16 +18,23 @@ $(PROJECT_INCLUDE)/libchip/%.h: %.h
$(PGM): $(mg5uart_rel_OBJECTS) $(PGM): $(mg5uart_rel_OBJECTS)
$(make-rel) $(make-rel)
## include_libchip_HEADERS = mg5uart.h include_libchipdir = $(includedir)/libchip
include_libchip_HEADERS = mg5uart.h
PREINSTALL_FILES = $(PROJECT_INCLUDE)/libchip \
$(PROJECT_INCLUDE)/libchip/mg5uart.h
## $(include_libchip_HEADERS:%=$(PROJECT_INCLUDE)/libchip/%)
all-local: $(ARCH) $(PREINSTALL_FILES) $(mg5uart_rel_OBJECTS) $(PGM) all-local: $(ARCH) $(PREINSTALL_FILES) $(mg5uart_rel_OBJECTS) $(PGM)
.PRECIOUS: $(PGM) .PRECIOUS: $(PGM)
EXTRA_DIST = mg5uart.c README.mguart mg5uart.c mg5uart.h mg5uart_reg.c EXTRA_DIST = mg5uart.c README.mguart mg5uart.c mg5uart_reg.c
PREINSTALL_FILES =
$(PROJECT_INCLUDE)/libchip:
@$(mkinstalldirs) $(PROJECT_INCLUDE)/libchip
PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip
$(PROJECT_INCLUDE)/libchip/mg5uart.h: mg5uart.h
$(INSTALL_DATA) $< $@
PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/mg5uart.h
include $(top_srcdir)/../../../automake/local.am include $(top_srcdir)/../../../automake/local.am

View File

@@ -4,7 +4,22 @@
ACLOCAL_AMFLAGS = -I ../../../../../../aclocal ACLOCAL_AMFLAGS = -I ../../../../../../aclocal
SUBDIRS = include vectorisrs SUBDIRS = . vectorisrs
include_libcpudir = $(includedir)/libcpu
include_libcpu_HEADERS = include/tx3904.h
all-local: $(PREINSTALL_FILES)
PREINSTALL_FILES =
$(PROJECT_INCLUDE)/libcpu:
@$(mkinstalldirs) $(PROJECT_INCLUDE)/libcpu
PREINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu
$(PROJECT_INCLUDE)/libcpu/tx3904.h: include/tx3904.h
$(INSTALL_DATA) $< $@
PREINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu/tx3904.h
include $(top_srcdir)/../../../automake/subdirs.am include $(top_srcdir)/../../../automake/subdirs.am
include $(top_srcdir)/../../../automake/local.am include $(top_srcdir)/../../../automake/local.am

View File

@@ -1,23 +0,0 @@
##
## $Id$
##
include_libcpudir = $(includedir)/libcpu
include_libcpu_HEADERS = tx3904.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 = tx3904.h
include $(top_srcdir)/../../../automake/local.am