summaryrefslogtreecommitdiffstats
path: root/c/src/libmisc
diff options
context:
space:
mode:
authorJoel Sherrill <joel.sherrill@OARcorp.com>2000-02-08 22:33:25 +0000
committerJoel Sherrill <joel.sherrill@OARcorp.com>2000-02-08 22:33:25 +0000
commit70810dcd8970194d96f685ffe4af890911e273c5 (patch)
treecade3ccf39b9bcabc04e7b1ce9105a83f80b177d /c/src/libmisc
parenta976681e4754543618441a2a2e7b6def98e588fb (diff)
downloadrtems-70810dcd8970194d96f685ffe4af890911e273c5.tar.bz2
Patches rtems-rc-20000204-0.diff from Ralf Corsepius <corsepiu@faw.uni-ulm.de>
that contains: * Removes remaining (now illegal) references to $(SRC) from a couple of Makefile.ams * Removes duplicate AC_CONFIG_SUBDIRS macro from c/configure.in * Moves ENABLE_LIBCDIR into RTEMS_PROG_C[C|XX]_FOR_TARGET (hides LIBCDIR from most configure scripts, i.e. LIBCDIR becomes less visible) * Adds RTEMS_PROG_C[C|XX]_FOR_TARGET and RTEMS_CANONICALIZE_TOOLS to libbsp/*/configure.ins (A minor bug in previous implementations, which only has an impact when switching to GNU/Cygnus canonicalization) * Cleans up several bogus comments. * Removes MKLIB * Switches the version number to 4.5.0 (for testing version number handling)
Diffstat (limited to 'c/src/libmisc')
-rw-r--r--c/src/libmisc/configure.in4
-rw-r--r--c/src/libmisc/cpuuse/Makefile.am29
-rw-r--r--c/src/libmisc/monitor/Makefile.am34
-rw-r--r--c/src/libmisc/rtmonuse/Makefile.am29
-rw-r--r--c/src/libmisc/stackchk/Makefile.am29
-rw-r--r--c/src/libmisc/untar/Makefile.am29
-rw-r--r--c/src/libmisc/wrapup/Makefile.am27
7 files changed, 88 insertions, 93 deletions
diff --git a/c/src/libmisc/configure.in b/c/src/libmisc/configure.in
index a1c35f5536..ef027f5574 100644
--- a/c/src/libmisc/configure.in
+++ b/c/src/libmisc/configure.in
@@ -13,7 +13,6 @@ AM_INIT_AUTOMAKE(rtems-c-src-libmisc,$RTEMS_VERSION,no)
AM_MAINTAINER_MODE
RTEMS_ENABLE_MULTIPROCESSING
-RTEMS_ENABLE_LIBCDIR
RTEMS_ENABLE_BARE
RTEMS_ENV_RTEMSBSP
@@ -23,7 +22,6 @@ RTEMS_CANONICAL_HOST
RTEMS_PROJECT_ROOT
-dnl check target cc
RTEMS_PROG_CC_FOR_TARGET
RTEMS_CANONICALIZE_TOOLS
@@ -32,7 +30,7 @@ RTEMS_CHECK_MULTIPROCESSING(RTEMS_BSP)
AM_CONDITIONAL(HAS_MP,test "$HAS_MP" = "yes")
-# Try to explicitly list a Makefile here
+# Explicitly list all Makefiles here
AC_OUTPUT(
Makefile
cpuuse/Makefile
diff --git a/c/src/libmisc/cpuuse/Makefile.am b/c/src/libmisc/cpuuse/Makefile.am
index d3bd220f54..542eae4bab 100644
--- a/c/src/libmisc/cpuuse/Makefile.am
+++ b/c/src/libmisc/cpuuse/Makefile.am
@@ -1,27 +1,21 @@
-##
-## $Id$
-##
+##
+## $Id$
+##
AUTOMAKE_OPTIONS = foreign 1.4
LIBNAME = libcpuuse-tmp
-LIB = ${ARCH}/${LIBNAME}.a
+LIB = $(ARCH)/$(LIBNAME).a
C_FILES = cpuuse.c
-C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o)
+C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.o)
H_FILES = cpuuse.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) $@
@@ -32,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 = README cpuuse.c cpuuse.h
include $(top_srcdir)/../../../automake/local.am
diff --git a/c/src/libmisc/monitor/Makefile.am b/c/src/libmisc/monitor/Makefile.am
index fa9f98db9d..2c8db51ffa 100644
--- a/c/src/libmisc/monitor/Makefile.am
+++ b/c/src/libmisc/monitor/Makefile.am
@@ -1,11 +1,11 @@
-##
-## $Id$
-##
+##
+## $Id$
+##
AUTOMAKE_OPTIONS = foreign 1.4
LIBNAME = libmonitor-tmp
-LIB = ${ARCH}/$(LIBNAME).a
+LIB = $(ARCH)/$(LIBNAME).a
# We only build multiprocessing related files if HAS_MP was defined
MP_C_FILES = mon-mpci.c
@@ -15,23 +15,17 @@ C_FILES = mon-command.c mon-symbols.c mon-prmisc.c mon-monitor.c \
mon-dname.c mon-itask.c mon-extension.c mon-manager.c mon-config.c
if HAS_MP
-C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o) $(MP_C_FILES:%.c=${ARCH}/%.o)
+C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.o) $(MP_C_FILES:%.c=$(ARCH)/%.o)
else
-C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o)
+C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.o)
endif
H_FILES = monitor.h symbols.h
-noinst_HEADERS = $(H_FILES)
-SRCS = README $(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) $@
@@ -42,11 +36,19 @@ $(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) $(MP_C_FILES)
+EXTRA_DIST = README mon-command.c mon-config.c mon-dname.c mon-driver.c \
+ mon-extension.c mon-itask.c mon-manager.c mon-monitor.c mon-mpci.c \
+ mon-object.c mon-prmisc.c mon-queue.c mon-server.c mon-symbols.c \
+ mon-task.c monitor.h symbols.h
include $(top_srcdir)/../../../automake/local.am
diff --git a/c/src/libmisc/rtmonuse/Makefile.am b/c/src/libmisc/rtmonuse/Makefile.am
index e701353a1f..76f7f19acd 100644
--- a/c/src/libmisc/rtmonuse/Makefile.am
+++ b/c/src/libmisc/rtmonuse/Makefile.am
@@ -1,27 +1,21 @@
-##
-## $Id$
-##
+##
+## $Id$
+##
AUTOMAKE_OPTIONS = foreign 1.4
LIBNAME = librtmonuse-tmp
-LIB = ${ARCH}/${LIBNAME}.a
+LIB = $(ARCH)/$(LIBNAME).a
C_FILES = rtmonuse.c
-C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o)
+C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.o)
H_FILES = rtmonuse.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) $@
@@ -32,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 = rtmonuse.c rtmonuse.h
include $(top_srcdir)/../../../automake/local.am
diff --git a/c/src/libmisc/stackchk/Makefile.am b/c/src/libmisc/stackchk/Makefile.am
index e5f467c42a..83dd699c85 100644
--- a/c/src/libmisc/stackchk/Makefile.am
+++ b/c/src/libmisc/stackchk/Makefile.am
@@ -1,28 +1,22 @@
-##
-## $Id$
-##
+##
+## $Id$
+##
AUTOMAKE_OPTIONS = foreign 1.4
LIBNAME = libstackchk-tmp
-LIB = ${ARCH}/${LIBNAME}.a
+LIB = $(ARCH)/$(LIBNAME).a
C_FILES = check.c
-C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o)
+C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.o)
H_FILES = internal.h
INSTALLED_H_FILES = stackchk.h
-noinst_HEADERS = $(H_FILES) $(INSTALLED_H_FILES)
-SRCS = $(C_FILES) $(H_FILES) $(INSTALLED_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 \
-$(INSTALLED_H_FILES:%=$(PROJECT_INCLUDE)/rtems/%)
+include $(top_srcdir)/../../../automake/lib.am
$(PROJECT_INCLUDE)/rtems:
@$(mkinstalldirs) $@
@@ -33,11 +27,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 \
+ $(INSTALLED_H_FILES:%=$(PROJECT_INCLUDE)/rtems/%)
+
+all-local: $(ARCH) $(PREINSTALL_FILES) $(OBJS) $(LIB)
+
+.PRECIOUS: $(LIB)
-EXTRA_DIST += $(C_FILES)
+EXTRA_DIST = README check.c internal.h stackchk.h
include $(top_srcdir)/../../../automake/local.am
diff --git a/c/src/libmisc/untar/Makefile.am b/c/src/libmisc/untar/Makefile.am
index 33badae971..6bb36617a3 100644
--- a/c/src/libmisc/untar/Makefile.am
+++ b/c/src/libmisc/untar/Makefile.am
@@ -1,27 +1,21 @@
-##
-## $Id$
-##
+##
+## $Id$
+##
AUTOMAKE_OPTIONS = foreign 1.4
LIBNAME = libuntar-tmp
-LIB = ${ARCH}/${LIBNAME}.a
+LIB = $(ARCH)/$(LIBNAME).a
C_FILES = untar.c
-C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o)
+C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.o)
H_FILES = untar.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) $@
@@ -32,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 = README untar.c untar.h
include $(top_srcdir)/../../../automake/local.am
diff --git a/c/src/libmisc/wrapup/Makefile.am b/c/src/libmisc/wrapup/Makefile.am
index d5021a7be0..5d43b326b3 100644
--- a/c/src/libmisc/wrapup/Makefile.am
+++ b/c/src/libmisc/wrapup/Makefile.am
@@ -1,23 +1,20 @@
-##
-## $Id$
-##
+##
+## $Id$
+##
AUTOMAKE_OPTIONS = foreign 1.4
LIBNAME = libmisc
-LIB = ${ARCH}/$(LIBNAME).a
+LIB = $(ARCH)/$(LIBNAME).a
include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
include $(top_srcdir)/../../../automake/lib.am
-TMP_LIBS = ../monitor/$(ARCH)/libmonitor-tmp.a ../untar/$(ARCH)/libuntar-tmp.a \
- ../stackchk/$(ARCH)/libstackchk-tmp.a ../cpuuse/$(ARCH)/libcpuuse-tmp.a \
- ../rtmonuse/$(ARCH)/librtmonuse-tmp.a \
+TMP_LIBS = ../monitor/$(ARCH)/libmonitor-tmp.a \
+ ../untar/$(ARCH)/libuntar-tmp.a ../stackchk/$(ARCH)/libstackchk-tmp.a \
+ ../cpuuse/$(ARCH)/libcpuuse-tmp.a ../rtmonuse/$(ARCH)/librtmonuse-tmp.a \
../dumpbuf/$(ARCH)/libdumpbuf-tmp.a
-TMPINSTALL_FILES += \
-$(PROJECT_RELEASE)/lib/$(LIBNAME)$(LIB_VARIANT).a
-
$(PROJECT_RELEASE)/lib/$(LIBNAME)$(LIB_VARIANT).a: $(LIB)
$(INSTALL_DATA) $< $@
@@ -29,12 +26,14 @@ $(LIB): $(TMP_LIBS)
$(RM) $@
$(RM) -r $(ARCH)
mkdir $(ARCH)
- cd $(ARCH); for lib in $^; do \
- $(AR) -xv ../$$lib; \
- done
+ cd $(ARCH); for lib in $^; do $(AR) -xv ../$$lib; done
$(AR) ruv $@ $(ARCH)/*
$(RANLIB) $@
-all: ${ARCH} $(LIB) $(TMPINSTALL_FILES)
+TMPINSTALL_FILES += $(PROJECT_RELEASE)/lib/$(LIBNAME)$(LIB_VARIANT).a
+
+all-local: $(ARCH) $(LIB) $(TMPINSTALL_FILES)
+
+.PRECIOUS: $(LIB)
include $(top_srcdir)/../../../automake/local.am