diff options
| author | Joel Sherrill <joel.sherrill@OARcorp.com> | 2000-06-12 15:00:15 +0000 |
|---|---|---|
| committer | Joel Sherrill <joel.sherrill@OARcorp.com> | 2000-06-12 15:00:15 +0000 |
| commit | df49c60c9671e4a28e636964d744c1f59fb6cb68 (patch) | |
| tree | eabd85e189514ad412a35414ba5d483dcda3ef1f /c/src/tests/support | |
| parent | Purged as many egcs references as possible. (diff) | |
| download | rtems-df49c60c9671e4a28e636964d744c1f59fb6cb68.tar.bz2 | |
Merged from 4.5.0-beta3a
Diffstat (limited to '')
| -rw-r--r-- | c/src/tests/support/include/Makefile.am | 18 | ||||
| -rw-r--r-- | c/src/tests/support/stubdr/Makefile.am | 8 | ||||
| -rw-r--r-- | c/src/tests/support/wrapup/Makefile.am | 11 |
3 files changed, 14 insertions, 23 deletions
diff --git a/c/src/tests/support/include/Makefile.am b/c/src/tests/support/include/Makefile.am index 72f0f3c837..d5d258b558 100644 --- a/c/src/tests/support/include/Makefile.am +++ b/c/src/tests/support/include/Makefile.am @@ -4,26 +4,20 @@ AUTOMAKE_OPTIONS = foreign 1.4 -project_bspdir=$(PROJECT_ROOT)/@RTEMS_BSP@ +project_bspdir = $(PROJECT_ROOT)/@RTEMS_BSP@ noinst_HEADERS = tmacros.h -TMPINSTALLDIRS=$(project_bspdir)/lib/include +TMPINSTALLFILES = $(project_bspdir)/lib/include \ + $(project_bspdir)/lib/include/tmacros.h -$(TMPINSTALLDIRS): +$(project_bspdir)/lib/include: $(mkinstalldirs) $@ - -TMPINSTALLFILES = $(project_bspdir)/lib/include/tmacros.h - $(project_bspdir)/lib/include/tmacros.h: tmacros.h $(INSTALL_DATA) $< $@ -CLEANFILES = $(TMPINSTALLFILES) - -install-tmp: $(TMPINSTALLFILES) +CLEANFILES = $(project_bspdir)/lib/include/tmacros.h -all: install-tmp -debug: install-tmp -profile: install-tmp +all-local: $(TMPINSTALLFILES) include $(top_srcdir)/../../../../automake/local.am diff --git a/c/src/tests/support/stubdr/Makefile.am b/c/src/tests/support/stubdr/Makefile.am index 5607df0e2d..a0978a7c83 100644 --- a/c/src/tests/support/stubdr/Makefile.am +++ b/c/src/tests/support/stubdr/Makefile.am @@ -1,6 +1,6 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 @@ -18,9 +18,7 @@ OBJS = $(C_O_FILES) include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(RTEMS_ROOT)/make/leaf.cfg -TMPINSTALL_FILES = \ -$(PROJECT_INCLUDE) \ -$(H_FILES:%=$(PROJECT_INCLUDE)/%) +TMPINSTALL_FILES += $(PROJECT_INCLUDE) $(H_FILES:%=$(PROJECT_INCLUDE)/%) $(PROJECT_INCLUDE): @$(mkinstalldirs) $@ diff --git a/c/src/tests/support/wrapup/Makefile.am b/c/src/tests/support/wrapup/Makefile.am index 752951613f..bb6a1e62e0 100644 --- a/c/src/tests/support/wrapup/Makefile.am +++ b/c/src/tests/support/wrapup/Makefile.am @@ -1,10 +1,10 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 -LIBNAME=libtest +LIBNAME = libtest LIB = $(ARCH)/$(LIBNAME).a GENERIC_FILES = stubdr @@ -19,8 +19,7 @@ include $(top_srcdir)/../../../../automake/lib.am # (OPTIONAL) Add local stuff here using += # -TMPINSTALL_FILES += \ -$(PROJECT_RELEASE)/lib/$(LIBNAME)$(LIB_VARIANT).a +TMPINSTALL_FILES += $(PROJECT_RELEASE)/lib/$(LIBNAME)$(LIB_VARIANT).a $(LIB): ${OBJS} $(make-library) @@ -28,6 +27,6 @@ $(LIB): ${OBJS} $(PROJECT_RELEASE)/lib/$(LIBNAME)$(LIB_VARIANT).a: $(LIB) $(INSTALL_DATA) $< $@ -all: ${ARCH} $(TMPINSTALL_FILES) +all-local: ${ARCH} $(TMPINSTALL_FILES) include $(top_srcdir)/../../../../automake/local.am |