2004-01-21 Ralf Corsepius <corsepiu@faw.uni-ulm.de>

* i960ca/Makefile.am, i960ka/Makefile.am, i960rp/Makefile.am:
	Use automake compilation rules.
	* Makefile.am: Add PREINSTALL_DIRS.
	* configure.ac: Add subdir-objects to AUTOMAKE_OPTIONS.
	Require automake >= 1.8.2.
This commit is contained in:
Ralf Corsepius
2004-01-21 07:18:35 +00:00
parent 63ae87612d
commit a44c5db968
6 changed files with 64 additions and 32 deletions

View File

@@ -1,3 +1,11 @@
2004-01-21 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* i960ca/Makefile.am, i960ka/Makefile.am, i960rp/Makefile.am:
Use automake compilation rules.
* Makefile.am: Add PREINSTALL_DIRS.
* configure.ac: Add subdir-objects to AUTOMAKE_OPTIONS.
Require automake >= 1.8.2.
2004-01-14 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* Makefile.am: Re-add dirstamps to PRE/TMPINSTALL_FILES.

View File

@@ -11,14 +11,15 @@ include_libcpudir = $(includedir)/libcpu
include_libcpu_HEADERS = include/i960CA.h include/i960HA.h include/i960KA.h \
include/i960RP.h include/i960JX_RP_common.h
all-local: $(TMPINSTALL_FILES)
all-local: $(PREINSTALL_FILES)
PREINSTALL_DIRS =
PREINSTALL_FILES =
$(PROJECT_INCLUDE)/libcpu/$(dirstamp):
@$(mkdir_p) $(PROJECT_INCLUDE)/libcpu
@: > $(PROJECT_INCLUDE)/libcpu/$(dirstamp)
PREINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu/$(dirstamp)
PREINSTALL_DIRS += $(PROJECT_INCLUDE)/libcpu/$(dirstamp)
$(PROJECT_INCLUDE)/libcpu/i960CA.h: include/i960CA.h $(PROJECT_INCLUDE)/libcpu/$(dirstamp)
$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libcpu/i960CA.h
@@ -41,6 +42,7 @@ $(PROJECT_INCLUDE)/libcpu/i960JX_RP_common.h: include/i960JX_RP_common.h $(PROJE
PREINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu/i960JX_RP_common.h
CLEANFILES = $(PREINSTALL_FILES)
DISTCLEANFILES = $(PREINSTALL_DIRS)
include $(top_srcdir)/../../../automake/subdirs.am
include $(top_srcdir)/../../../automake/local.am

View File

@@ -9,16 +9,16 @@ RTEMS_TOP(../../../../..)
RTEMS_CANONICAL_TARGET_CPU
AM_INIT_AUTOMAKE([no-define foreign 1.8])
AM_INIT_AUTOMAKE([no-define foreign subdir-objects 1.8.2])
AM_MAINTAINER_MODE
RTEMS_ENABLE_BARE
RTEMS_ENV_RTEMSBSP
RTEMS_PROJECT_ROOT
RTEMS_PROG_CC_FOR_TARGET
AM_PROG_CC_C_O
RTEMS_CANONICALIZE_TOOLS
AM_CONDITIONAL(i960ca, test "$RTEMS_CPU_MODEL" = "i960ca")
@@ -29,6 +29,7 @@ AM_CONDITIONAL(i960rp, test "$RTEMS_CPU_MODEL" = "i960rp")
AC_CONFIG_FILES([Makefile
i960ca/Makefile
i960ka/Makefile
i960rp/Makefile])
i960rp/Makefile
])
AC_OUTPUT

View File

@@ -5,17 +5,24 @@
include $(top_srcdir)/../../../automake/compile.am
include $(top_srcdir)/../../../automake/lib.am
C_FILES = cpu_install_intr_stack.c cpu_install_raw_isr.c
OBJS = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT))
#
# (OPTIONAL) Add local stuff here using +=
#
EXTRA_PROGRAMS =
CLEANFILES =
noinst_DATA =
if i960ca
all-local: $(OBJS)
EXTRA_PROGRAMS += score.rel
CLEANFILES += score.rel
score_rel_SOURCES = cpu_install_intr_stack.c cpu_install_raw_isr.c
score_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V)
score_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
EXTRA_PROGRAMS += score_g.rel
CLEANFILES += score_g.rel
score_g_rel_SOURCES = $(score_rel_SOURCES)
score_g_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V)
score_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
noinst_DATA += score$(LIB_VARIANT).rel
endif
EXTRA_DIST = cpu_install_intr_stack.c cpu_install_raw_isr.c
include $(top_srcdir)/../../../automake/local.am

View File

@@ -5,17 +5,24 @@
include $(top_srcdir)/../../../automake/compile.am
include $(top_srcdir)/../../../automake/lib.am
C_FILES = cpu_install_intr_stack.c cpu_install_raw_isr.c
OBJS = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT))
#
# (OPTIONAL) Add local stuff here using +=
#
EXTRA_PROGRAMS =
CLEANFILES =
noinst_DATA =
if i960ka
all-local: $(OBJS)
EXTRA_PROGRAMS += score.rel
CLEANFILES += score.rel
score_rel_SOURCES = cpu_install_intr_stack.c cpu_install_raw_isr.c
score_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V)
score_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
EXTRA_PROGRAMS += score_g.rel
CLEANFILES += score_g.rel
score_g_rel_SOURCES = $(score_rel_SOURCES)
score_g_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V)
score_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
noinst_DATA += score$(LIB_VARIANT).rel
endif
EXTRA_DIST = cpu_install_intr_stack.c cpu_install_raw_isr.c
include $(top_srcdir)/../../../automake/local.am

View File

@@ -5,17 +5,24 @@
include $(top_srcdir)/../../../automake/compile.am
include $(top_srcdir)/../../../automake/lib.am
C_FILES = cpu_install_intr_stack.c cpu_install_raw_isr.c
OBJS = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT))
#
# (OPTIONAL) Add local stuff here using +=
#
EXTRA_PROGRAMS =
CLEANFILES =
noinst_DATA =
if i960rp
all-local: $(OBJS)
EXTRA_PROGRAMS += score.rel
CLEANFILES += score.rel
score_rel_SOURCES = cpu_install_intr_stack.c cpu_install_raw_isr.c
score_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V)
score_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
EXTRA_PROGRAMS += score_g.rel
CLEANFILES += score_g.rel
score_g_rel_SOURCES = $(score_rel_SOURCES)
score_g_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V)
score_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
noinst_DATA += score$(LIB_VARIANT).rel
endif
EXTRA_DIST = cpu_install_intr_stack.c cpu_install_raw_isr.c
include $(top_srcdir)/../../../automake/local.am