summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoel Sherrill <joel.sherrill@OARcorp.com>1999-11-23 13:52:59 +0000
committerJoel Sherrill <joel.sherrill@OARcorp.com>1999-11-23 13:52:59 +0000
commitd5b004b6e3293e8758d42b3205a94a8590196882 (patch)
tree25647495038888450d325adee8583cd614b06171
parentfd170023c54adf8ccd2d4f38443bbe109003c7d0 (diff)
downloadrtems-d5b004b6e3293e8758d42b3205a94a8590196882.tar.bz2
Patch from Ralf Corsepius <corsepiu@faw.uni-ulm.de>
to convert the libmisc directory from Makefile.in to Makefile.am.
-rw-r--r--c/src/libmisc/cpuuse/Makefile.am2
-rw-r--r--c/src/libmisc/dummy/Makefile.am8
-rw-r--r--c/src/libmisc/dumpbuf/Makefile.am2
-rw-r--r--c/src/libmisc/monitor/Makefile.am2
-rw-r--r--c/src/libmisc/rtmonuse/Makefile.am2
-rw-r--r--c/src/libmisc/stackchk/Makefile.am2
-rw-r--r--c/src/libmisc/untar/Makefile.am2
-rw-r--r--c/src/libmisc/wrapup/Makefile.am11
-rw-r--r--cpukit/libmisc/cpuuse/Makefile.am2
-rw-r--r--cpukit/libmisc/dummy/Makefile.am8
-rw-r--r--cpukit/libmisc/dumpbuf/Makefile.am2
-rw-r--r--cpukit/libmisc/monitor/Makefile.am2
-rw-r--r--cpukit/libmisc/rtmonuse/Makefile.am2
-rw-r--r--cpukit/libmisc/stackchk/Makefile.am2
-rw-r--r--cpukit/libmisc/untar/Makefile.am2
-rw-r--r--cpukit/libmisc/wrapup/Makefile.am11
16 files changed, 26 insertions, 36 deletions
diff --git a/c/src/libmisc/cpuuse/Makefile.am b/c/src/libmisc/cpuuse/Makefile.am
index 45b4f8b88e..d3bd220f54 100644
--- a/c/src/libmisc/cpuuse/Makefile.am
+++ b/c/src/libmisc/cpuuse/Makefile.am
@@ -32,7 +32,7 @@ $(PROJECT_INCLUDE)/rtems/%.h: %.h
# (OPTIONAL) Add local stuff here using +=
#
-${LIB}: ${SRCS} ${OBJS}
+${LIB}: ${OBJS}
$(make-library)
all: ${ARCH} $(PREINSTALL_FILES) $(LIB) $(TMPINSTALL_FILES)
diff --git a/c/src/libmisc/dummy/Makefile.am b/c/src/libmisc/dummy/Makefile.am
index 296cdc48c6..5d3026cc53 100644
--- a/c/src/libmisc/dummy/Makefile.am
+++ b/c/src/libmisc/dummy/Makefile.am
@@ -11,9 +11,7 @@ PGM = ${ARCH}/$(PGMNAME).rel
C_FILES = dummy.c
C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o)
-H_FILES =
-
-SRCS = $(C_FILES) $(H_FILES)
+SRCS = $(C_FILES)
OBJS = $(C_O_FILES)
include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
@@ -23,14 +21,14 @@ TMPINSTALL_FILES = \
$(PROJECT_INCLUDE)/rtems \
$(PROJECT_RELEASE)/lib/$(PGMNAME)$(LIB_VARIANT).rel
-$(PROJECT_INCLUDE)/rtems):
+$(PROJECT_INCLUDE)/rtems:
@$(mkinstalldirs) $@
#
# (OPTIONAL) Add local stuff here using +=
#
-${PGM}: ${SRCS} ${OBJS}
+${PGM}: ${OBJS}
$(make-rel)
$(PROJECT_RELEASE)/lib/$(PGMNAME)$(LIB_VARIANT).rel: $(PGM)
diff --git a/c/src/libmisc/dumpbuf/Makefile.am b/c/src/libmisc/dumpbuf/Makefile.am
index 01e3225ec7..634b36b860 100644
--- a/c/src/libmisc/dumpbuf/Makefile.am
+++ b/c/src/libmisc/dumpbuf/Makefile.am
@@ -33,7 +33,7 @@ $(PROJECT_INCLUDE)/rtems/%.h: %.h
# (OPTIONAL) Add local stuff here using +=
#
-${LIB}: ${SRCS} ${OBJS}
+${LIB}: ${OBJS}
$(make-library)
all: ${ARCH} $(PREINSTALL_FILES) $(LIB) $(TMPINSTALL_FILES)
diff --git a/c/src/libmisc/monitor/Makefile.am b/c/src/libmisc/monitor/Makefile.am
index c1567ef917..03e63cb0bd 100644
--- a/c/src/libmisc/monitor/Makefile.am
+++ b/c/src/libmisc/monitor/Makefile.am
@@ -43,7 +43,7 @@ $(PROJECT_INCLUDE)/rtems/%.h: %.h
# (OPTIONAL) Add local stuff here using +=
#
-${LIB}: ${SRCS} ${OBJS}
+${LIB}: ${OBJS}
$(make-library)
all: ${ARCH} $(PREINSTALL_FILES) $(LIB) $(TMPINSTALL_FILES)
diff --git a/c/src/libmisc/rtmonuse/Makefile.am b/c/src/libmisc/rtmonuse/Makefile.am
index 4d2db38b27..e701353a1f 100644
--- a/c/src/libmisc/rtmonuse/Makefile.am
+++ b/c/src/libmisc/rtmonuse/Makefile.am
@@ -32,7 +32,7 @@ $(PROJECT_INCLUDE)/rtems/%.h: %.h
# (OPTIONAL) Add local stuff here using +=
#
-${LIB}: ${SRCS} ${OBJS}
+${LIB}: ${OBJS}
$(make-library)
all: ${ARCH} $(PREINSTALL_FILES) $(LIB) $(TMPINSTALL_FILES)
diff --git a/c/src/libmisc/stackchk/Makefile.am b/c/src/libmisc/stackchk/Makefile.am
index 4430ffae32..e5f467c42a 100644
--- a/c/src/libmisc/stackchk/Makefile.am
+++ b/c/src/libmisc/stackchk/Makefile.am
@@ -33,7 +33,7 @@ $(PROJECT_INCLUDE)/rtems/%.h: %.h
# (OPTIONAL) Add local stuff here using +=
#
-${LIB}: ${SRCS} ${OBJS}
+${LIB}: ${OBJS}
$(make-library)
all: ${ARCH} $(PREINSTALL_FILES) $(LIB) $(TMPINSTALL_FILES)
diff --git a/c/src/libmisc/untar/Makefile.am b/c/src/libmisc/untar/Makefile.am
index 2219fec095..33badae971 100644
--- a/c/src/libmisc/untar/Makefile.am
+++ b/c/src/libmisc/untar/Makefile.am
@@ -32,7 +32,7 @@ $(PROJECT_INCLUDE)/rtems/%.h: %.h
# (OPTIONAL) Add local stuff here using +=
#
-${LIB}: ${SRCS} ${OBJS}
+${LIB}: ${OBJS}
$(make-library)
all: ${ARCH} $(PREINSTALL_FILES) $(LIB) $(TMPINSTALL_FILES)
diff --git a/c/src/libmisc/wrapup/Makefile.am b/c/src/libmisc/wrapup/Makefile.am
index f5a62744f0..d5021a7be0 100644
--- a/c/src/libmisc/wrapup/Makefile.am
+++ b/c/src/libmisc/wrapup/Makefile.am
@@ -8,20 +8,17 @@ LIBNAME = libmisc
LIB = ${ARCH}/$(LIBNAME).a
include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(RTEMS_ROOT)/make/lib.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 \
../dumpbuf/$(ARCH)/libdumpbuf-tmp.a
-TMPINSTALL_FILES = \
-$(PROJECT_RELEASE)/lib \
-$(PROJECT_RELEASE)/lib/$(LIBNAME)$(LIBSUFFIX_VA)
+TMPINSTALL_FILES += \
+$(PROJECT_RELEASE)/lib/$(LIBNAME)$(LIB_VARIANT).a
-$(PROJECT_RELEASE)/lib:
- @$(mkinstalldirs) $@
-$(PROJECT_RELEASE)/lib/$(LIBNAME)$(LIBSUFFIX_VA): $(LIB)
+$(PROJECT_RELEASE)/lib/$(LIBNAME)$(LIB_VARIANT).a: $(LIB)
$(INSTALL_DATA) $< $@
#
diff --git a/cpukit/libmisc/cpuuse/Makefile.am b/cpukit/libmisc/cpuuse/Makefile.am
index 45b4f8b88e..d3bd220f54 100644
--- a/cpukit/libmisc/cpuuse/Makefile.am
+++ b/cpukit/libmisc/cpuuse/Makefile.am
@@ -32,7 +32,7 @@ $(PROJECT_INCLUDE)/rtems/%.h: %.h
# (OPTIONAL) Add local stuff here using +=
#
-${LIB}: ${SRCS} ${OBJS}
+${LIB}: ${OBJS}
$(make-library)
all: ${ARCH} $(PREINSTALL_FILES) $(LIB) $(TMPINSTALL_FILES)
diff --git a/cpukit/libmisc/dummy/Makefile.am b/cpukit/libmisc/dummy/Makefile.am
index 296cdc48c6..5d3026cc53 100644
--- a/cpukit/libmisc/dummy/Makefile.am
+++ b/cpukit/libmisc/dummy/Makefile.am
@@ -11,9 +11,7 @@ PGM = ${ARCH}/$(PGMNAME).rel
C_FILES = dummy.c
C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o)
-H_FILES =
-
-SRCS = $(C_FILES) $(H_FILES)
+SRCS = $(C_FILES)
OBJS = $(C_O_FILES)
include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
@@ -23,14 +21,14 @@ TMPINSTALL_FILES = \
$(PROJECT_INCLUDE)/rtems \
$(PROJECT_RELEASE)/lib/$(PGMNAME)$(LIB_VARIANT).rel
-$(PROJECT_INCLUDE)/rtems):
+$(PROJECT_INCLUDE)/rtems:
@$(mkinstalldirs) $@
#
# (OPTIONAL) Add local stuff here using +=
#
-${PGM}: ${SRCS} ${OBJS}
+${PGM}: ${OBJS}
$(make-rel)
$(PROJECT_RELEASE)/lib/$(PGMNAME)$(LIB_VARIANT).rel: $(PGM)
diff --git a/cpukit/libmisc/dumpbuf/Makefile.am b/cpukit/libmisc/dumpbuf/Makefile.am
index 01e3225ec7..634b36b860 100644
--- a/cpukit/libmisc/dumpbuf/Makefile.am
+++ b/cpukit/libmisc/dumpbuf/Makefile.am
@@ -33,7 +33,7 @@ $(PROJECT_INCLUDE)/rtems/%.h: %.h
# (OPTIONAL) Add local stuff here using +=
#
-${LIB}: ${SRCS} ${OBJS}
+${LIB}: ${OBJS}
$(make-library)
all: ${ARCH} $(PREINSTALL_FILES) $(LIB) $(TMPINSTALL_FILES)
diff --git a/cpukit/libmisc/monitor/Makefile.am b/cpukit/libmisc/monitor/Makefile.am
index c1567ef917..03e63cb0bd 100644
--- a/cpukit/libmisc/monitor/Makefile.am
+++ b/cpukit/libmisc/monitor/Makefile.am
@@ -43,7 +43,7 @@ $(PROJECT_INCLUDE)/rtems/%.h: %.h
# (OPTIONAL) Add local stuff here using +=
#
-${LIB}: ${SRCS} ${OBJS}
+${LIB}: ${OBJS}
$(make-library)
all: ${ARCH} $(PREINSTALL_FILES) $(LIB) $(TMPINSTALL_FILES)
diff --git a/cpukit/libmisc/rtmonuse/Makefile.am b/cpukit/libmisc/rtmonuse/Makefile.am
index 4d2db38b27..e701353a1f 100644
--- a/cpukit/libmisc/rtmonuse/Makefile.am
+++ b/cpukit/libmisc/rtmonuse/Makefile.am
@@ -32,7 +32,7 @@ $(PROJECT_INCLUDE)/rtems/%.h: %.h
# (OPTIONAL) Add local stuff here using +=
#
-${LIB}: ${SRCS} ${OBJS}
+${LIB}: ${OBJS}
$(make-library)
all: ${ARCH} $(PREINSTALL_FILES) $(LIB) $(TMPINSTALL_FILES)
diff --git a/cpukit/libmisc/stackchk/Makefile.am b/cpukit/libmisc/stackchk/Makefile.am
index 4430ffae32..e5f467c42a 100644
--- a/cpukit/libmisc/stackchk/Makefile.am
+++ b/cpukit/libmisc/stackchk/Makefile.am
@@ -33,7 +33,7 @@ $(PROJECT_INCLUDE)/rtems/%.h: %.h
# (OPTIONAL) Add local stuff here using +=
#
-${LIB}: ${SRCS} ${OBJS}
+${LIB}: ${OBJS}
$(make-library)
all: ${ARCH} $(PREINSTALL_FILES) $(LIB) $(TMPINSTALL_FILES)
diff --git a/cpukit/libmisc/untar/Makefile.am b/cpukit/libmisc/untar/Makefile.am
index 2219fec095..33badae971 100644
--- a/cpukit/libmisc/untar/Makefile.am
+++ b/cpukit/libmisc/untar/Makefile.am
@@ -32,7 +32,7 @@ $(PROJECT_INCLUDE)/rtems/%.h: %.h
# (OPTIONAL) Add local stuff here using +=
#
-${LIB}: ${SRCS} ${OBJS}
+${LIB}: ${OBJS}
$(make-library)
all: ${ARCH} $(PREINSTALL_FILES) $(LIB) $(TMPINSTALL_FILES)
diff --git a/cpukit/libmisc/wrapup/Makefile.am b/cpukit/libmisc/wrapup/Makefile.am
index f5a62744f0..d5021a7be0 100644
--- a/cpukit/libmisc/wrapup/Makefile.am
+++ b/cpukit/libmisc/wrapup/Makefile.am
@@ -8,20 +8,17 @@ LIBNAME = libmisc
LIB = ${ARCH}/$(LIBNAME).a
include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(RTEMS_ROOT)/make/lib.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 \
../dumpbuf/$(ARCH)/libdumpbuf-tmp.a
-TMPINSTALL_FILES = \
-$(PROJECT_RELEASE)/lib \
-$(PROJECT_RELEASE)/lib/$(LIBNAME)$(LIBSUFFIX_VA)
+TMPINSTALL_FILES += \
+$(PROJECT_RELEASE)/lib/$(LIBNAME)$(LIB_VARIANT).a
-$(PROJECT_RELEASE)/lib:
- @$(mkinstalldirs) $@
-$(PROJECT_RELEASE)/lib/$(LIBNAME)$(LIBSUFFIX_VA): $(LIB)
+$(PROJECT_RELEASE)/lib/$(LIBNAME)$(LIB_VARIANT).a: $(LIB)
$(INSTALL_DATA) $< $@
#