From 372e4e2758a71783ef18f413eb8fa365b7705d5b Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Wed, 13 Sep 2000 13:08:11 +0000 Subject: 2000-09-13 Ralf Corsepius * aclocal/rtems-top.m4: Add ENDIF-hack. * automake/compile.am: Add include $(DEPENDS) + ENDIF-hack. --- ChangeLog | 5 +++++ aclocal/rtems-top.m4 | 4 ++++ automake/compile.am | 6 ++++++ 3 files changed, 15 insertions(+) diff --git a/ChangeLog b/ChangeLog index edba3c0a7f..f26d94bd34 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2000-09-13 Ralf Corsepius + + * aclocal/rtems-top.m4: Add ENDIF-hack. + * automake/compile.am: Add include $(DEPENDS) + ENDIF-hack. + 2000-09-12 Ralf Corsepius * aclocal/check-cxx.m4: Add AC_SUBST(CPLUS_LD_LIBS) diff --git a/aclocal/rtems-top.m4 b/aclocal/rtems-top.m4 index 67e3afe50f..7622c33c8f 100644 --- a/aclocal/rtems-top.m4 +++ b/aclocal/rtems-top.m4 @@ -11,6 +11,10 @@ AC_CHECK_PROGS(MAKE, gmake make) AC_BEFORE([$0], [AC_CONFIG_AUX_DIR])dnl AC_BEFORE([$0], [AM_INIT_AUTOMAKE])dnl +## HACK to allow gnu-make conditionals in automake-Makefiles. +ENDIF=endif +AC_SUBST(ENDIF) + AC_ARG_WITH(target-subdir, [ --with-target-subdir=DIR], TARGET_SUBDIR="$withval", diff --git a/automake/compile.am b/automake/compile.am index 29c7137732..a6c340c28b 100644 --- a/automake/compile.am +++ b/automake/compile.am @@ -175,6 +175,12 @@ depend-am: $(C_FILES) $(CC_FILES) $(S_FILES) mv $(DEPEND).tmp $(DEPEND) depend: depend-am +# pull in dependencies if they exist +ifeq (${DEPEND},$(wildcard ${DEPEND})) +include ${DEPEND} +@ENDIF@ + + # spell out all the LINK_FILE's, rather than using -lbsp, so # that $(LINK_FILES) can be a dependency -- cgit v1.2.3