From 9608320702e8dba9947987cd34001824638c434e Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Mon, 22 Nov 1999 13:41:11 +0000 Subject: Patch rtems-rc-19991117-4.diff from Ralf Corsepius : .. a major configuration cleanup ... major enhancement of automake support. ... and it contains a *major* breakthough: Automake support for libchip and libmisc *LEAF* directories. To implement this I have used several nasty tricks * The basical trick is to wrap an old Makefile.in's contents into a Makefile.am and still continue to use (i.e include) the old *.cfg files. * Replaced each INSTALL_IF_CHANGE and INSTALL_VARIANT with make dependencies * Add a gnu-make ifdef AUTOMAKE to main.cfg to avoid conflicts between automake and RTEMS make rules * Replaced each install:: and preinstall:: rule with make dependencies * Replaced SUB_DIRS with SUBDIRS in all Makefile.ins (Automake convention) * Removed each manually added autoconf substitution which automake performs automatically. This is not yet full automake support, because using the temporary installation directory, preinstallation in general and building variants are in contradiction to automake's basic working principles ... ... the new Makefile.ams work still somewhat clumsy ... nevertheless they work (quite well). WARNING: At first glance this patch is small, but * it affects the whole configuration system. * it opens the road to introducing automake to all Makefile.ins currently not being under automake control. JOEL> Does this remove or add any files? Both, all Makefile.ins below libchip and libmisc get replaced with Makefile.ams. --- make/custom/Linux-posix.cfg | 2 +- make/custom/erc32.cfg | 5 +---- 2 files changed, 2 insertions(+), 5 deletions(-) (limited to 'make/custom') diff --git a/make/custom/Linux-posix.cfg b/make/custom/Linux-posix.cfg index 4b84c2b3cb..910dd70be2 100644 --- a/make/custom/Linux-posix.cfg +++ b/make/custom/Linux-posix.cfg @@ -55,7 +55,7 @@ define make-target-options endef define make-exe - $(CC) $(CPPFLAGS) $(CFLAGS) -o $@ $(LINK_OBJS) $(LINK_LIBS) + $(LINK.c) $(LDLIBS) -o $@ $(LINK_OBJS) $(LINK_LIBS) $(NM) -ng $@ > $(basename $@).num $(SIZE) $@ endef diff --git a/make/custom/erc32.cfg b/make/custom/erc32.cfg index 47f5f091fd..e75b6877e8 100644 --- a/make/custom/erc32.cfg +++ b/make/custom/erc32.cfg @@ -28,9 +28,6 @@ endif # -O4 is ok for RTEMS CFLAGS_OPTIMIZE_V=-O4 -# Override default start file -START_BASE=startsis - # This makes the target dependent options file # NDEBUG (C library) @@ -90,7 +87,7 @@ define make-exe endef else define make-exe - $(CC) $(CPPFLAGS) $(CFLAGS) $(CFLAGS_LD) -o $(basename $@).exe \ + $(LINK.c) $(LDLIBS) -o $(basename $@).exe \ $(LINK_OBJS) $(LINK_LIBS) $(NM) -g -n $(basename $@).exe > $(basename $@).num $(SIZE) $(basename $@).exe -- cgit v1.2.3