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

* clock/Makefile.am: Convert to using automake compilation rules.
	* mongoosev/Makefile.am: Ditto.
	* r46xx/Makefile.am: Ditto.
	* shared/Makefile.am: Ditto.
	* timer/Makefile.am: Ditto.
	* tx39/Makefile.am: Ditto.
	* Makefile.am: Remove conditional subdirs.
	* configure.ac: Add subdir-object to AUTOMAKE_OPTIONS.
	Require automake-1.8.2. Add AM_PROG_CC_C_O.
This commit is contained in:
Ralf Corsepius
2004-01-18 09:18:06 +00:00
parent 0cf9970b44
commit 9a874631f6
9 changed files with 144 additions and 163 deletions

View File

@@ -1,3 +1,15 @@
2004-01-18 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* clock/Makefile.am: Convert to using automake compilation rules.
* mongoosev/Makefile.am: Ditto.
* r46xx/Makefile.am: Ditto.
* shared/Makefile.am: Ditto.
* timer/Makefile.am: Ditto.
* tx39/Makefile.am: Ditto.
* Makefile.am: Remove conditional subdirs.
* configure.ac: Add subdir-object to AUTOMAKE_OPTIONS.
Require automake-1.8.2. Add AM_PROG_CC_C_O.
2004-01-14 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* mongoosev/Makefile.am: Re-add dirstamps to PRE/TMPINSTALL_FILES.

View File

@@ -4,21 +4,7 @@
ACLOCAL_AMFLAGS = -I ../../../aclocal
SHARED_LIB = shared
if mongoosev
CPU_SUBDIR = mongoosev
endif
if tx39
CPU_SUBDIR = tx39
endif
if r46xx
CPU_SUBDIR = clock timer r46xx
endif
SUBDIRS = $(SHARED_LIB) $(CPU_SUBDIR)
SUBDIRS = shared mongoosev tx39 clock timer r46xx
include $(top_srcdir)/../../../automake/subdirs.am
include $(top_srcdir)/../../../automake/local.am

View File

@@ -2,31 +2,27 @@
## $Id$
##
PGM = $(ARCH)/clock.rel
C_FILES = ckinit.c
S_FILES = clock.S
noinst_HEADERS = clock.h
clock_rel_OBJECTS = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT)) \
$(S_FILES:%.S=$(ARCH)/%.$(OBJEXT))
EXTRA_PROGRAMS =
CLEANFILES =
noinst_DATA =
include $(top_srcdir)/../../../automake/compile.am
include $(top_srcdir)/../../../automake/lib.am
#
# (OPTIONAL) Add local stuff here using +=
#
if r46xx
EXTRA_PROGRAMS += clock.rel
CLEANFILES += clock.rel
clock_rel_SOURCES = ckinit.c clock.S clock.h
clock_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V)
clock_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
$(PGM): $(clock_rel_OBJECTS)
$(make-rel)
EXTRA_PROGRAMS += clock_g.rel
CLEANFILES += clock_g.rel
clock_g_rel_SOURCES = $(clock_rel_SOURCES)
clock_g_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V)
clock_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
all-local: $(clock_rel_OBJECTS) $(PGM)
.PRECIOUS: $(PGM)
EXTRA_DIST = ckinit.c clock.S clock.h
noinst_DATA += clock$(LIB_VARIANT).rel
endif
include $(top_srcdir)/../../../automake/local.am

View File

@@ -18,6 +18,7 @@ RTEMS_ENV_RTEMSBSP
RTEMS_PROJECT_ROOT
RTEMS_PROG_CC_FOR_TARGET
AM_PROG_CC_C_O
RTEMS_CANONICALIZE_TOOLS
RTEMS_PROG_CCAS

View File

@@ -4,13 +4,15 @@
ACLOCAL_AMFLAGS = -I ../../../../../../aclocal
EXTRA_PROGRAMS =
EXTRA_DIST =
CLEANDIRS =
CLEANFILES =
noinst_DATA =
include $(top_srcdir)/../../../automake/compile.am
include $(top_srcdir)/../../../automake/lib.am
if mongoosev
include_mipsdir = $(includedir)/libcpu
include_mips_HEADERS = include/mongoose-v.h
@@ -18,46 +20,44 @@ include_mips_HEADERS = include/mongoose-v.h
include_libchipdir = $(includedir)/libchip
include_libchip_HEADERS = duart/mg5uart.h
duart_C_FILES = duart/mg5uart.c duart/mg5uart_reg.c
EXTRA_DIST += $(duart_C_FILES) duart/README.mguart
EXTRA_DIST += duart/README.mguart
duart_rel_OBJECTS = $(duart_C_FILES:duart/%.c=duart/$(ARCH)/%.$(OBJEXT))
EXTRA_PROGRAMS += duart.rel
CLEANFILES += duart.rel
duart_rel_SOURCES = duart/mg5uart.c duart/mg5uart.h duart/mg5uart_reg.c
duart_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V)
duart_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
duart/$(ARCH)/$(dirstamp):
@$(mkdir_p) duart/$(ARCH)
@: > duart/$(ARCH)/$(dirstamp)
duart/$(ARCH)/%.$(OBJEXT): duart/%.c duart/$(ARCH)/$(dirstamp)
${COMPILE} -o $@ -c $<
duart/$(ARCH)/mg5uart.rel: $(duart_rel_OBJECTS)
$(make-rel)
CLEANDIRS += duart/o-optimize duart/o-debug
noinst_DATA += duart/$(ARCH)/mg5uart.rel
EXTRA_PROGRAMS += duart_g.rel
CLEANFILES += duart_g.rel
duart_g_rel_SOURCES = $(duart_rel_SOURCES)
duart_g_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V)
duart_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
noinst_DATA += duart$(LIB_VARIANT).rel
## vectorisrs
vectorisrs_C_FILES = vectorisrs/maxvectors.c vectorisrs/vectorisrs.c
EXTRA_DIST += $(vectorisrs_C_FILES)
vectorisrs_rel_OBJECTS = \
$(vectorisrs_C_FILES:vectorisrs/%.c=vectorisrs/$(ARCH)/%.$(OBJEXT))
EXTRA_PROGRAMS += vectorisrs.rel
CLEANFILES += vectorisrs.rel
vectorisrs_rel_SOURCES = vectorisrs/maxvectors.c vectorisrs/vectorisrs.c
vectorisrs_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V)
vectorisrs_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
vectorisrs/$(ARCH)/$(dirstamp):
@$(mkdir_p) vectorisrs/$(ARCH)
@: > vectorisrs/$(ARCH)/$(dirstamp)
vectorisrs/$(ARCH)/%.$(OBJEXT): vectorisrs/%.c vectorisrs/$(ARCH)/$(dirstamp)
${COMPILE} -o $@ -c $<
vectorisrs/$(ARCH)/vectorisrs.rel: $(vectorisrs_rel_OBJECTS)
$(make-rel)
CLEANDIRS += vectorisrs/o-optimize vectorisrs/o-debug
noinst_DATA += vectorisrs/$(ARCH)/vectorisrs.rel
EXTRA_PROGRAMS += vectorisrs_g.rel
CLEANFILES += vectorisrs_g.rel
vectorisrs_g_rel_SOURCES = $(vectorisrs_rel_SOURCES)
vectorisrs_g_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V)
vectorisrs_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
## --
all-local: $(PREINSTALL_FILES)
noinst_DATA += vectorisrs$(LIB_VARIANT).rel
endif
all-local: $(PREINSTALL_FILES)
PREINSTALL_FILES =
if mongoosev
$(PROJECT_INCLUDE)/libcpu/$(dirstamp):
@$(mkdir_p) $(PROJECT_INCLUDE)/libcpu
@: > $(PROJECT_INCLUDE)/libcpu/$(dirstamp)
@@ -75,7 +75,8 @@ PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/$(dirstamp)
$(PROJECT_INCLUDE)/libchip/mg5uart.h: duart/mg5uart.h $(PROJECT_INCLUDE)/libchip/$(dirstamp)
$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/mg5uart.h
PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/mg5uart.h
endif
CLEANFILES = $(PREINSTALL_FILES)
CLEANFILES += $(PREINSTALL_FILES)
include $(top_srcdir)/../../../automake/local.am

View File

@@ -4,29 +4,27 @@
ACLOCAL_AMFLAGS = -I ../../../../../../aclocal
EXTRA_DIST =
CLEANDIRS =
EXTRA_PROGRAMS =
CLEANFILES =
noinst_DATA =
include $(top_srcdir)/../../../automake/compile.am
include $(top_srcdir)/../../../automake/lib.am
vectorisrs_C_FILES = vectorisrs/maxvectors.c vectorisrs/vectorisrs.c
EXTRA_DIST += $(vectorisrs_C_FILES)
if r46xx
EXTRA_PROGRAMS += vectorisrs.rel
CLEANFILES += vectorisrs.rel
vectorisrs_rel_SOURCES = vectorisrs/maxvectors.c vectorisrs/vectorisrs.c
vectorisrs_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V)
vectorisrs_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
vectorisrs_rel_OBJECTS = \
$(vectorisrs_C_FILES:vectorisrs/%.c=vectorisrs/$(ARCH)/%.$(OBJEXT))
EXTRA_PROGRAMS += vectorisrs_g.rel
CLEANFILES += vectorisrs_g.rel
vectorisrs_g_rel_SOURCES = $(vectorisrs_rel_SOURCES)
vectorisrs_g_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V)
vectorisrs_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
vectorisrs/$(ARCH)/$(dirstamp):
@$(mkdir_p) vectorisrs/$(ARCH)
@: > vectorisrs/$(ARCH)/$(dirstamp)
vectorisrs/$(ARCH)/%.$(OBJEXT): vectorisrs/%.c vectorisrs/$(ARCH)/$(dirstamp)
${COMPILE} -o $@ -c $<
vectorisrs/$(ARCH)/vectorisrs.rel: $(vectorisrs_rel_OBJECTS)
$(make-rel)
CLEANDIRS += vectorisrs/o-optimize vectorisrs/o-debug
noinst_DATA += vectorisrs/$(ARCH)/vectorisrs.rel
## --
noinst_DATA += vectorisrs$(LIB_VARIANT).rel
endif
include $(top_srcdir)/../../../automake/local.am

View File

@@ -3,8 +3,9 @@
##
EXTRA_DIST =
CLEANDIRS =
CLEANFILES =
noinst_DATA =
EXTRA_PROGRAMS =
include $(top_srcdir)/../../../automake/compile.am
include $(top_srcdir)/../../../automake/lib.am
@@ -12,62 +13,51 @@ include $(top_srcdir)/../../../automake/lib.am
## cache
include_libcpudir = $(includedir)/libcpu
noinst_HEADERS = cache/cache_.h
include_libcpu_HEADERS = ../../shared/include/cache.h
cache_C_FILES = cache/cache.c
common_C_FILES = ../../shared/src/cache_aligned_malloc.c
common_C_FILES += ../../shared/src/cache_manager.c
EXTRA_PROGRAMS += cache.rel
CLEANFILES += cache.rel
cache_rel_SOURCES = cache/cache.c ../../shared/src/cache_aligned_malloc.c \
../../shared/src/cache_manager.c cache/cache_.h
cache_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V) -I$(srcdir)/cache
cache_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
cache_rel_OBJECTS = $(cache_C_FILES:cache/%.c=cache/$(ARCH)/%.$(OBJEXT))
cache_rel_OBJECTS += \
$(common_C_FILES:../../shared/src/%.c=cache/$(ARCH)/%.$(OBJEXT))
EXTRA_PROGRAMS += cache_g.rel
CLEANFILES += cache_g.rel
cache_g_rel_SOURCES = $(cache_rel_SOURCES)
cache_g_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V) -I$(srcdir)/cache
cache_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
AM_CPPFLAGS += -I$(srcdir)/cache
cache/$(ARCH)/$(dirstamp):
@$(mkdir_p) cache/$(ARCH)
@: > cache/$(ARCH)/$(dirstamp)
cache/$(ARCH)/%.$(OBJEXT): cache/%.c cache/$(ARCH)/$(dirstamp)
${COMPILE} -o $@ -c $<
cache/$(ARCH)/%.$(OBJEXT): ../../shared/src/%.c cache/$(ARCH)/$(dirstamp)
${COMPILE} -o $@ -c $<
cache/$(ARCH)/cache.rel: $(cache_rel_OBJECTS)
$(make-rel)
CLEANDIRS += cache/o-optimize cache/o-debug
noinst_DATA += cache/$(ARCH)/cache.rel
noinst_DATA += cache$(LIB_VARIANT).rel
## interrupts
interrupts_C_FILES = interrupts/installisrentries.c \
interrupts/vectorexceptions.c
interrupts_S_FILES = interrupts/isr_entries.S
interrupts_rel_OBJECTS = \
$(interrupts_C_FILES:interrupts/%.c=interrupts/$(ARCH)/%.$(OBJEXT)) \
$(interrupts_S_FILES:interrupts/%.S=interrupts/$(ARCH)/%.$(OBJEXT))
if tx39
EXTRA_FLAGS = -DTX39
interrupts_CPPFLAGS = -DTX39
endif
if mongoosev
EXTRA_FLAGS = -DMONGOOSEV
interrupts_CPPFLAGS = -DMONGOOSEV
endif
AM_CPPFLAGS += $(EXTRA_FLAGS)
EXTRA_PROGRAMS += interrupts.rel
CLEANFILES += interrupts.rel
interrupts_rel_SOURCES = interrupts/installisrentries.c \
interrupts/vectorexceptions.c interrupts/isr_entries.S
interrupts_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V) \
$(interrupts_CPPFLAGS)
interrupts_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
interrupts/$(ARCH)/$(dirstamp):
@$(mkdir_p) interrupts/$(ARCH)
@: > interrupts/$(ARCH)/$(dirstamp)
interrupts/$(ARCH)/%.$(OBJEXT): interrupts/%.c interrupts/$(ARCH)/$(dirstamp)
${COMPILE} -o $@ -c $<
interrupts/$(ARCH)/%.$(OBJEXT): interrupts/%.S interrupts/$(ARCH)/$(dirstamp)
${CCASCOMPILE} -o $@ -c $<
interrupts/$(ARCH)/interrupts.rel: $(interrupts_rel_OBJECTS)
$(make-rel)
CLEANDIRS += interrupts/o-optimize interrupts/o-debug
noinst_DATA += interrupts/$(ARCH)/interrupts.rel
EXTRA_PROGRAMS += interrupts_g.rel
CLEANFILES += interrupts_g.rel
interrupts_g_rel_SOURCES = $(interrupts_rel_SOURCES)
interrupts_g_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V) \
$(interrupts_CPPFLAGS)
interrupts_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
noinst_DATA += interrupts$(LIB_VARIANT).rel
all-local: $(PREINSTALL_FILES)
## --
@@ -82,6 +72,6 @@ $(PROJECT_INCLUDE)/libcpu/cache.h: ../../shared/include/cache.h $(PROJECT_INCLUD
$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libcpu/cache.h
PREINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu/cache.h
CLEANFILES = $(PREINSTALL_FILES)
CLEANFILES += $(PREINSTALL_FILES)
include $(top_srcdir)/../../../automake/local.am

View File

@@ -2,29 +2,27 @@
## $Id$
##
PGM = $(ARCH)/timer.rel
C_FILES = timer.c
S_FILES = gettime.S
timer_rel_OBJECTS = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT)) \
$(S_FILES:%.S=$(ARCH)/%.$(OBJEXT))
EXTRA_PROGRAMS =
CLEANFILES =
noinst_DATA =
include $(top_srcdir)/../../../automake/compile.am
include $(top_srcdir)/../../../automake/lib.am
#
# (OPTIONAL) Add local stuff here using +=
#
if r46xx
EXTRA_PROGRAMS += timer.rel
CLEANFILES += timer.rel
timer_rel_SOURCES = timer.c gettime.S
timer_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V)
timer_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
$(PGM): $(timer_rel_OBJECTS)
$(make-rel)
EXTRA_PROGRAMS += timer_g.rel
CLEANFILES += timer_g.rel
timer_g_rel_SOURCES = $(timer_rel_SOURCES)
timer_g_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V)
timer_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
all-local: $(timer_rel_OBJECTS) $(PGM)
.PRECIOUS: $(PGM)
EXTRA_DIST = gettime.S timer.c
noinst_DATA += timer$(LIB_VARIANT).rel
endif
include $(top_srcdir)/../../../automake/local.am

View File

@@ -4,39 +4,37 @@
ACLOCAL_AMFLAGS = -I ../../../../../../aclocal
EXTRA_DIST =
CLEANDIRS =
EXTRA_PROGRAMS =
CLEANFILES =
noinst_DATA =
include $(top_srcdir)/../../../automake/compile.am
include $(top_srcdir)/../../../automake/lib.am
if tx39
include_libcpudir = $(includedir)/libcpu
include_libcpu_HEADERS = include/tx3904.h
## vectorisrs
vectorisrs_C_FILES = vectorisrs/maxvectors.c vectorisrs/vectorisrs.c
EXTRA_DIST += $(vectorisrs_C_FILES)
EXTRA_PROGRAMS += vectorisrs.rel
CLEANFILES += vectorisrs.rel
vectorisrs_rel_SOURCES = vectorisrs/maxvectors.c vectorisrs/vectorisrs.c
vectorisrs_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V)
vectorisrs_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
vectorisrs_rel_OBJECTS = \
$(vectorisrs_C_FILES:vectorisrs/%.c=vectorisrs/$(ARCH)/%.$(OBJEXT))
EXTRA_PROGRAMS += vectorisrs_g.rel
CLEANFILES += vectorisrs_g.rel
vectorisrs_g_rel_SOURCES = $(vectorisrs_rel_SOURCES)
vectorisrs_g_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V)
vectorisrs_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
vectorisrs/$(ARCH)/$(dirstamp):
@$(mkdir_p) vectorisrs/$(ARCH)
@: > vectorisrs/$(ARCH)/$(dirstamp)
vectorisrs/$(ARCH)/%.$(OBJEXT): vectorisrs/%.c vectorisrs/$(ARCH)/$(dirstamp)
${COMPILE} -o $@ -c $<
vectorisrs/$(ARCH)/vectorisrs.rel: $(vectorisrs_rel_OBJECTS)
$(make-rel)
CLEANDIRS += vectorisrs/o-optimize vectorisrs/o-debug
noinst_DATA += vectorisrs/$(ARCH)/vectorisrs.rel
## --
noinst_DATA += vectorisrs$(LIB_VARIANT).rel
endif
all-local: $(PREINSTALL_FILES)
PREINSTALL_FILES =
if tx39
$(PROJECT_INCLUDE)/libcpu/$(dirstamp):
@$(mkdir_p) $(PROJECT_INCLUDE)/libcpu
@: > $(PROJECT_INCLUDE)/libcpu/$(dirstamp)
@@ -45,7 +43,8 @@ PREINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu/$(dirstamp)
$(PROJECT_INCLUDE)/libcpu/tx3904.h: include/tx3904.h $(PROJECT_INCLUDE)/libcpu/$(dirstamp)
$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libcpu/tx3904.h
PREINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu/tx3904.h
endif
CLEANFILES = $(PREINSTALL_FILES)
CLEANFILES += $(PREINSTALL_FILES)
include $(top_srcdir)/../../../automake/local.am