diff options
author | Joel Sherrill <joel.sherrill@OARcorp.com> | 2000-01-31 15:27:02 +0000 |
---|---|---|
committer | Joel Sherrill <joel.sherrill@OARcorp.com> | 2000-01-31 15:27:02 +0000 |
commit | 4e36a2f133c68aaf637e166385eff1a05b59f38e (patch) | |
tree | 47520e4fbb8b685c25ae2909cf2a12287be4268b /cpukit/libmisc | |
parent | Patch rtems-rc-20000118-2.diff from Ralf Corsepius <corsepiu@faw.uni-ulm.de> (diff) | |
download | rtems-4e36a2f133c68aaf637e166385eff1a05b59f38e.tar.bz2 |
Patches rtems-rc-20000118-3.diff and rtems-rc-20000118-4.diff from
Ralf Corsepius <corsepiu@faw.uni-ulm.de> that contain:
* Modifications, (minor) corrections, cleanups to most existing
Makefile.ams
* Adds automake support to all remaining BSPs which have not yet been
converted to automake.
* Makefile.am for all remaining wrapup/Makefile.ams
Diffstat (limited to 'cpukit/libmisc')
-rw-r--r-- | cpukit/libmisc/dummy/Makefile.am | 31 | ||||
-rw-r--r-- | cpukit/libmisc/dumpbuf/Makefile.am | 30 | ||||
-rw-r--r-- | cpukit/libmisc/monitor/Makefile.am | 1 |
3 files changed, 27 insertions, 35 deletions
diff --git a/cpukit/libmisc/dummy/Makefile.am b/cpukit/libmisc/dummy/Makefile.am index 5d3026cc53..ba67d1a561 100644 --- a/cpukit/libmisc/dummy/Makefile.am +++ b/cpukit/libmisc/dummy/Makefile.am @@ -1,41 +1,36 @@ -# -# $Id$ -# +## +## $Id$ +## AUTOMAKE_OPTIONS = foreign 1.4 PGMNAME = dummy -PGM = ${ARCH}/$(PGMNAME).rel +PGM = $(ARCH)/$(PGMNAME).rel -# C source names, if any, go here -- minus the .c C_FILES = dummy.c -C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o) +C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.o) -SRCS = $(C_FILES) OBJS = $(C_O_FILES) include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg -include $(RTEMS_ROOT)/make/lib.cfg - -TMPINSTALL_FILES = \ -$(PROJECT_INCLUDE)/rtems \ -$(PROJECT_RELEASE)/lib/$(PGMNAME)$(LIB_VARIANT).rel - -$(PROJECT_INCLUDE)/rtems: - @$(mkinstalldirs) $@ +include $(top_srcdir)/../../../automake/lib.am # # (OPTIONAL) Add local stuff here using += # -${PGM}: ${OBJS} +$(PGM): $(OBJS) $(make-rel) $(PROJECT_RELEASE)/lib/$(PGMNAME)$(LIB_VARIANT).rel: $(PGM) $(INSTALL_DATA) $< $@ -all: ${ARCH} $(TMPINSTALL_FILES) +TMPINSTALL_FILES += $(PROJECT_RELEASE)/lib/$(PGMNAME)$(LIB_VARIANT).rel + +all-local: $(ARCH) $(OBJS) $(PGM) $(TMPINSTALL_FILES) + +.PRECIOUS: $(PGM) -EXTRA_DIST = $(C_FILES) +EXTRA_DIST = README dummy.c include $(top_srcdir)/../../../automake/local.am diff --git a/cpukit/libmisc/dumpbuf/Makefile.am b/cpukit/libmisc/dumpbuf/Makefile.am index 634b36b860..7bcd22e46e 100644 --- a/cpukit/libmisc/dumpbuf/Makefile.am +++ b/cpukit/libmisc/dumpbuf/Makefile.am @@ -1,28 +1,21 @@ -## -## $Id$ -## +## +## $Id$ +## AUTOMAKE_OPTIONS = foreign 1.4 LIBNAME = libdumpbuf-tmp -LIB = ${ARCH}/$(LIBNAME).a +LIB = $(ARCH)/$(LIBNAME).a -# C source names, if any, go here -- minus the .c C_FILES = dumpbuf.c -C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o) +C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.o) H_FILES = dumpbuf.h -noinst_HEADERS = $(H_FILES) -SRCS = $(C_FILES) $(H_FILES) OBJS = $(C_O_FILES) include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg -include $(RTEMS_ROOT)/make/lib.cfg - -PREINSTALL_FILES = \ -$(PROJECT_INCLUDE)/rtems \ -$(H_FILES:%=$(PROJECT_INCLUDE)/rtems/%) +include $(top_srcdir)/../../../automake/lib.am $(PROJECT_INCLUDE)/rtems: @$(mkinstalldirs) $@ @@ -33,11 +26,16 @@ $(PROJECT_INCLUDE)/rtems/%.h: %.h # (OPTIONAL) Add local stuff here using += # -${LIB}: ${OBJS} +$(LIB): $(OBJS) $(make-library) -all: ${ARCH} $(PREINSTALL_FILES) $(LIB) $(TMPINSTALL_FILES) +PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems \ + $(H_FILES:%=$(PROJECT_INCLUDE)/rtems/%) + +all-local: $(ARCH) $(PREINSTALL_FILES) $(OBJS) $(LIB) + +.PRECIOUS: $(LIB) -EXTRA_DIST += $(C_FILES) +EXTRA_DIST = dumpbuf.c dumpbuf.h include $(top_srcdir)/../../../automake/local.am diff --git a/cpukit/libmisc/monitor/Makefile.am b/cpukit/libmisc/monitor/Makefile.am index 03e63cb0bd..fa9f98db9d 100644 --- a/cpukit/libmisc/monitor/Makefile.am +++ b/cpukit/libmisc/monitor/Makefile.am @@ -7,7 +7,6 @@ AUTOMAKE_OPTIONS = foreign 1.4 LIBNAME = libmonitor-tmp LIB = ${ARCH}/$(LIBNAME).a -# C source names, if any, go here -- minus the .c # We only build multiprocessing related files if HAS_MP was defined MP_C_FILES = mon-mpci.c |