From fcf00342a6cf14ce1cb191d688bb780ed587408c Mon Sep 17 00:00:00 2001 From: Ralf Corsepius Date: Fri, 20 Feb 2004 01:11:53 +0000 Subject: 2004-02-20 Ralf Corsepius * libchip/Makefile.am, librdbg/Makefile.am, optman/Makefile.am, wrapup/Makefile.am: Fix automake problems having been introduced in previous patch. --- c/src/ChangeLog | 6 ++++++ c/src/libchip/Makefile.am | 2 +- c/src/librdbg/Makefile.am | 2 +- c/src/optman/Makefile.am | 3 +-- c/src/wrapup/Makefile.am | 3 +-- 5 files changed, 10 insertions(+), 6 deletions(-) (limited to 'c') diff --git a/c/src/ChangeLog b/c/src/ChangeLog index 49cf7cd620..eca3f698e9 100644 --- a/c/src/ChangeLog +++ b/c/src/ChangeLog @@ -1,3 +1,9 @@ +2004-02-20 Ralf Corsepius + + * libchip/Makefile.am, librdbg/Makefile.am, optman/Makefile.am, + wrapup/Makefile.am: Fix automake problems having been introduced + in previous patch. + 2004-02-19 Ralf Corsepius * libchip/Makefile.am, librdbg/Makefile.am, optman/Makefile.am: diff --git a/c/src/libchip/Makefile.am b/c/src/libchip/Makefile.am index 503783b24b..66e917074c 100644 --- a/c/src/libchip/Makefile.am +++ b/c/src/libchip/Makefile.am @@ -152,7 +152,7 @@ PREINSTALL_DIRS += $(PROJECT_INCLUDE)/$(dirstamp) $(PROJECT_LIB)/$(dirstamp): @$(mkdir_p) $(PROJECT_LIB) @: > $(PROJECT_LIB)/$(dirstamp) -PREINSTALL_DIRS += $(PROJECT_LIB)/$(dirstamp) +TMPINSTALL_FILES += $(PROJECT_LIB)/$(dirstamp) if LIBCHIP $(PROJECT_INCLUDE)/libchip/$(dirstamp): diff --git a/c/src/librdbg/Makefile.am b/c/src/librdbg/Makefile.am index afae87b7cc..e1d41d7bfe 100644 --- a/c/src/librdbg/Makefile.am +++ b/c/src/librdbg/Makefile.am @@ -193,7 +193,7 @@ TMPINSTALL_FILES = $(PROJECT_LIB)/$(dirstamp): @$(mkdir_p) $(PROJECT_LIB) @: > $(PROJECT_LIB)/$(dirstamp) -PREINSTALL_DIRS += $(PROJECT_LIB)/$(dirstamp) +TMPINSTALL_FILES += $(PROJECT_LIB)/$(dirstamp) if HAS_RDBG $(PROJECT_INCLUDE)/rdbg/$(dirstamp): diff --git a/c/src/optman/Makefile.am b/c/src/optman/Makefile.am index 591545ac56..dbcfe5bf14 100644 --- a/c/src/optman/Makefile.am +++ b/c/src/optman/Makefile.am @@ -183,7 +183,7 @@ TMPINSTALL_FILES = $(PROJECT_LIB)/$(dirstamp): @$(mkdir_p) $(PROJECT_LIB) @: > $(PROJECT_LIB)/$(dirstamp) -PREINSTALL_DIRS += $(PROJECT_LIB)/$(dirstamp) +TMPINSTALL_FILES += $(PROJECT_LIB)/$(dirstamp) $(PROJECT_LIB)/no-ext$(LIB_VARIANT).rel: no-ext$(LIB_VARIANT).rel $(PROJECT_LIB)/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_LIB)/no-ext$(LIB_VARIANT).rel @@ -233,7 +233,6 @@ $(PROJECT_LIB)/no-timer$(LIB_VARIANT).rel: no-timer$(LIB_VARIANT).rel $(PROJECT_ $(INSTALL_DATA) $< $(PROJECT_LIB)/no-timer$(LIB_VARIANT).rel TMPINSTALL_FILES += $(PROJECT_LIB)/no-timer$(LIB_VARIANT).rel -DISTCLEANFILES = $(PREINSTALL_DIRS) CLEANFILES += $(TMPINSTALL_FILES) include $(top_srcdir)/automake/local.am diff --git a/c/src/wrapup/Makefile.am b/c/src/wrapup/Makefile.am index 865ce28728..a665c438c6 100644 --- a/c/src/wrapup/Makefile.am +++ b/c/src/wrapup/Makefile.am @@ -97,13 +97,12 @@ TMPINSTALL_FILES = $(PROJECT_LIB)/$(dirstamp): @$(mkdir_p) $(PROJECT_LIB) @: > $(PROJECT_LIB)/$(dirstamp) -PREINSTALL_DIRS += $(PROJECT_LIB)/$(dirstamp) +TMPINSTALL_FILES += $(PROJECT_LIB)/$(dirstamp) $(PROJECT_LIB)/librtemsbsp$(LIB_VARIANT).a: $(ARCH)/librtemsbsp$(LIB_VARIANT).a $(PROJECT_LIB)/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_LIB)/librtemsbsp$(LIB_VARIANT).a TMPINSTALL_FILES += $(PROJECT_LIB)/librtemsbsp$(LIB_VARIANT).a -DISTCLEANFILES = $(PREINSTALL_DIRS) CLEANFILES += $(TMPINSTALL_FILES) include $(top_srcdir)/automake/local.am -- cgit v1.2.3