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

2003-12-11 Ralf Corsepius <corsepiu@faw.uni-ulm.de>

Browse Source 
* configure.ac: Remove make/custom/Makefile.
	* Makefile.am: Cosmetics.
	* automake/compile.am: Remove compilation rules.
	Remove $(ARCH) directory generation.
This commit is contained in:
Ralf Corsepius
2003-12-11 16:32:00 +00:00
parent f5279d9d4a
commit 88c3c5eec5
4 changed files with 9 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@@ -1,3 +1,10 @@
2003-12-11 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* configure.ac: Remove make/custom/Makefile.
* Makefile.am: Cosmetics.
* automake/compile.am: Remove compilation rules.
Remove $(ARCH) directory generation.
2003-11-26 Joel Sherrill <joel@OARcorp.com> 2003-11-26 Joel Sherrill <joel@OARcorp.com>
* MAINTAINERS: New file. * MAINTAINERS: New file.

5
Makefile.am
View File

@@ -11,7 +11,7 @@ ACLOCAL_AMFLAGS = -I aclocal
SUBDIRS = make $(build_SUBDIRS) $(host_SUBDIRS) $(target_SUBDIRS) SUBDIRS = make $(build_SUBDIRS) $(host_SUBDIRS) $(target_SUBDIRS)
AUTOMAKE_FILES = AUTOMAKE_FILES =
AUTOMAKE_FILES += automake/compile.am AUTOMAKE_FILES += automake/compile.am
AUTOMAKE_FILES += automake/host.am AUTOMAKE_FILES += automake/host.am
AUTOMAKE_FILES += automake/local.am AUTOMAKE_FILES += automake/local.am
AUTOMAKE_FILES += automake/subdirs.am AUTOMAKE_FILES += automake/subdirs.am
@@ -43,8 +43,7 @@ ACLOCAL_FILES += aclocal/version.m4
noinst_SCRIPTS = bootstrap noinst_SCRIPTS = bootstrap
EXTRA_DIST = README.configure SUPPORT \ EXTRA_DIST = README.configure SUPPORT VERSION LICENSE $(noinst_SCRIPTS)
VERSION LICENSE $(noinst_SCRIPTS)
EXTRA_DIST += $(AUTOMAKE_FILES) EXTRA_DIST += $(AUTOMAKE_FILES)
EXTRA_DIST += $(ACLOCAL_FILES) EXTRA_DIST += $(ACLOCAL_FILES)

12
automake/compile.am
View File

@@ -90,15 +90,6 @@ CCASCOMPILE = $(CCAS) $(AM_CCASFLAGS) $(CCASFLAGS)
AS = $(CC) AS = $(CC)
ASCOMPILE = $(AS) $(AM_ASFLAGS) $(ASFLAGS) ASCOMPILE = $(AS) $(AM_ASFLAGS) $(ASFLAGS)
${ARCH}/%.o: %.c
${COMPILE} -o $@ -c $<
${ARCH}/%.o: %.cc
${CXXCOMPILE} -o $@ -c $<
${ARCH}/%.o: %.S
${CCASCOMPILE} -DASM -o $@ -c $<
# Dependency files for use by gmake # Dependency files for use by gmake
# NOTE: we don't put them into $(ARCH) # NOTE: we don't put them into $(ARCH)
# so that 'make clean' doesn't blow it away # so that 'make clean' doesn't blow it away
@@ -217,9 +208,6 @@ AM_CFLAGS =
AM_CXXFLAGS = AM_CXXFLAGS =
AM_CCASFLAGS = $(CPU_CFLAGS) $(RTEMS_CPPFLAGS) $(RTEMS_CCASFLAGS) AM_CCASFLAGS = $(CPU_CFLAGS) $(RTEMS_CPPFLAGS) $(RTEMS_CCASFLAGS)
${ARCH}:
mkdir ${ARCH}
clean-local: clean-local:
$(RM) -r o-optimize o-debug $(CLEANDIRS) $(RM) -r o-optimize o-debug $(CLEANDIRS)
$(RM) Depends-o-optimize.tmp Depends-o-debug.tmp $(RM) Depends-o-optimize.tmp Depends-o-debug.tmp

1
configure.ac
View File

@@ -59,7 +59,6 @@ RTEMS_TARGET_CONFIG_SUBDIRS([c])
AC_CONFIG_FILES([Makefile AC_CONFIG_FILES([Makefile
make/Makefile make/Makefile
make/custom/Makefile
]) ])
AC_OUTPUT AC_OUTPUT