diff options
author | Ralf Corsepius <ralf.corsepius@rtems.org> | 2002-12-12 06:09:21 +0000 |
---|---|---|
committer | Ralf Corsepius <ralf.corsepius@rtems.org> | 2002-12-12 06:09:21 +0000 |
commit | 126660c57df9c4e8ddde2284cff099de9a8eb438 (patch) | |
tree | eba1b4e14b23689294dc22a34a784e43fc6d99b0 /cpukit | |
parent | 2002-12-12 Ralf Corsepius <corsepiu@faw.uni-ulm.de> (diff) | |
download | rtems-126660c57df9c4e8ddde2284cff099de9a8eb438.tar.bz2 |
2002-12-12 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* configure.ac: Require autoconf-2.57+automake-1.7.2.
* capture/Makefile.am: Eliminate C_O_FILES.
* cpuuse/Makefile.am: Ditto.
* devnull/Makefile.am: Ditto.
* dummy/Makefile.am: Ditto.
* dumpbuf/Makefile.am: Ditto.
* monitor/Makefile.am: Ditto.
* rtmonuse/Makefile.am: Ditto.
* serdbg/Makefile.am: Ditto.
* shell/Makefile.am: Ditto.
* stackchk/Makefile.am: Ditto.
* untar/Makefile.am: Ditto.
* mw-fb/Makefile.am: Eliminate C_O_FILES.
Eliminate SRCS.
Diffstat (limited to '')
-rw-r--r-- | cpukit/libmisc/ChangeLog | 17 | ||||
-rw-r--r-- | cpukit/libmisc/capture/Makefile.am | 4 | ||||
-rw-r--r-- | cpukit/libmisc/configure.ac | 4 | ||||
-rw-r--r-- | cpukit/libmisc/cpuuse/Makefile.am | 4 | ||||
-rw-r--r-- | cpukit/libmisc/devnull/Makefile.am | 4 | ||||
-rw-r--r-- | cpukit/libmisc/dummy/Makefile.am | 4 | ||||
-rw-r--r-- | cpukit/libmisc/dumpbuf/Makefile.am | 4 | ||||
-rw-r--r-- | cpukit/libmisc/monitor/Makefile.am | 7 | ||||
-rw-r--r-- | cpukit/libmisc/mw-fb/Makefile.am | 5 | ||||
-rw-r--r-- | cpukit/libmisc/rtmonuse/Makefile.am | 4 | ||||
-rw-r--r-- | cpukit/libmisc/serdbg/Makefile.am | 4 | ||||
-rw-r--r-- | cpukit/libmisc/shell/Makefile.am | 4 | ||||
-rw-r--r-- | cpukit/libmisc/stackchk/Makefile.am | 4 | ||||
-rw-r--r-- | cpukit/libmisc/untar/Makefile.am | 4 |
14 files changed, 32 insertions, 41 deletions
diff --git a/cpukit/libmisc/ChangeLog b/cpukit/libmisc/ChangeLog index ed2704bf3a..f5a82c4c53 100644 --- a/cpukit/libmisc/ChangeLog +++ b/cpukit/libmisc/ChangeLog @@ -1,5 +1,22 @@ 2002-12-12 Ralf Corsepius <corsepiu@faw.uni-ulm.de> + * configure.ac: Require autoconf-2.57+automake-1.7.2. + * capture/Makefile.am: Eliminate C_O_FILES. + * cpuuse/Makefile.am: Ditto. + * devnull/Makefile.am: Ditto. + * dummy/Makefile.am: Ditto. + * dumpbuf/Makefile.am: Ditto. + * monitor/Makefile.am: Ditto. + * rtmonuse/Makefile.am: Ditto. + * serdbg/Makefile.am: Ditto. + * shell/Makefile.am: Ditto. + * stackchk/Makefile.am: Ditto. + * untar/Makefile.am: Ditto. + * mw-fb/Makefile.am: Eliminate C_O_FILES. + Eliminate SRCS. + +2002-12-12 Ralf Corsepius <corsepiu@faw.uni-ulm.de> + Moving libmisc from rtems/c/src to rtems/cpukit. * Makefile.am: Reflect new path. diff --git a/cpukit/libmisc/capture/Makefile.am b/cpukit/libmisc/capture/Makefile.am index 7e204a5651..769e8f935b 100644 --- a/cpukit/libmisc/capture/Makefile.am +++ b/cpukit/libmisc/capture/Makefile.am @@ -8,12 +8,10 @@ LIBNAME = libcapture-tmp LIB = $(ARCH)/$(LIBNAME).a C_FILES = capture.c capture-cli.c -C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT)) +OBJS = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT)) include_rtems_HEADERS = capture.h capture-cli.h -OBJS = $(C_O_FILES) - include $(top_srcdir)/../automake/compile.am include $(top_srcdir)/../automake/lib.am diff --git a/cpukit/libmisc/configure.ac b/cpukit/libmisc/configure.ac index b45a400561..4f86e53f19 100644 --- a/cpukit/libmisc/configure.ac +++ b/cpukit/libmisc/configure.ac @@ -2,7 +2,7 @@ ## ## $Id$ -AC_PREREQ(2.52) +AC_PREREQ(2.57) AC_INIT([rtems-cpukit-libmisc],[_RTEMS_VERSION],[rtems-bugs@OARcorp.com]) AC_CONFIG_SRCDIR([dumpbuf]) RTEMS_TOP(../..) @@ -10,7 +10,7 @@ AC_CONFIG_AUX_DIR(../..) RTEMS_CANONICAL_TARGET_CPU -AM_INIT_AUTOMAKE([no-define foreign 1.6]) +AM_INIT_AUTOMAKE([no-define foreign 1.7.2]) AM_MAINTAINER_MODE RTEMS_ENABLE_BARE diff --git a/cpukit/libmisc/cpuuse/Makefile.am b/cpukit/libmisc/cpuuse/Makefile.am index f2f4ab1cbf..1962e863c7 100644 --- a/cpukit/libmisc/cpuuse/Makefile.am +++ b/cpukit/libmisc/cpuuse/Makefile.am @@ -9,12 +9,10 @@ LIBNAME = libcpuuse-tmp LIB = $(ARCH)/$(LIBNAME).a C_FILES = cpuuse.c -C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT)) +OBJS = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT)) include_rtems_HEADERS = cpuuse.h -OBJS = $(C_O_FILES) - include $(top_srcdir)/../automake/compile.am include $(top_srcdir)/../automake/lib.am diff --git a/cpukit/libmisc/devnull/Makefile.am b/cpukit/libmisc/devnull/Makefile.am index 50cf27b2db..5f62a07b4a 100644 --- a/cpukit/libmisc/devnull/Makefile.am +++ b/cpukit/libmisc/devnull/Makefile.am @@ -9,12 +9,10 @@ LIBNAME = libdevnull-tmp LIB = $(ARCH)/$(LIBNAME).a C_FILES = devnull.c -C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT)) +OBJS = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT)) include_rtems_HEADERS = devnull.h -OBJS = $(C_O_FILES) - include $(top_srcdir)/../automake/compile.am include $(top_srcdir)/../automake/lib.am diff --git a/cpukit/libmisc/dummy/Makefile.am b/cpukit/libmisc/dummy/Makefile.am index 5ff23599ad..73b4cb966a 100644 --- a/cpukit/libmisc/dummy/Makefile.am +++ b/cpukit/libmisc/dummy/Makefile.am @@ -7,9 +7,7 @@ LIBNAME = libdummy-tmp LIB = $(ARCH)/$(LIBNAME).a C_FILES = dummy.c -C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT)) - -OBJS = $(C_O_FILES) +OBJS = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT)) include $(top_srcdir)/../automake/compile.am include $(top_srcdir)/../automake/lib.am diff --git a/cpukit/libmisc/dumpbuf/Makefile.am b/cpukit/libmisc/dumpbuf/Makefile.am index f1c3f29ef3..ff0152da2d 100644 --- a/cpukit/libmisc/dumpbuf/Makefile.am +++ b/cpukit/libmisc/dumpbuf/Makefile.am @@ -9,12 +9,10 @@ LIBNAME = libdumpbuf-tmp LIB = $(ARCH)/$(LIBNAME).a C_FILES = dumpbuf.c -C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT)) +OBJS = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT)) include_rtems_HEADERS = dumpbuf.h -OBJS = $(C_O_FILES) - include $(top_srcdir)/../automake/compile.am include $(top_srcdir)/../automake/lib.am diff --git a/cpukit/libmisc/monitor/Makefile.am b/cpukit/libmisc/monitor/Makefile.am index eb39a2e1f4..d45e52eaea 100644 --- a/cpukit/libmisc/monitor/Makefile.am +++ b/cpukit/libmisc/monitor/Makefile.am @@ -15,16 +15,13 @@ C_FILES = mon-command.c mon-symbols.c mon-prmisc.c mon-monitor.c \ mon-object.c mon-server.c mon-task.c mon-queue.c mon-driver.c \ mon-dname.c mon-itask.c mon-extension.c mon-manager.c mon-config.c +OBJS = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT)) if HAS_MP -C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT)) $(MP_C_FILES:%.c=$(ARCH)/%.$(OBJEXT)) -else -C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT)) +OBJS += $(MP_C_FILES:%.c=$(ARCH)/%.$(OBJEXT)) endif include_rtems_HEADERS = monitor.h symbols.h -OBJS = $(C_O_FILES) - include $(top_srcdir)/../automake/compile.am include $(top_srcdir)/../automake/lib.am diff --git a/cpukit/libmisc/mw-fb/Makefile.am b/cpukit/libmisc/mw-fb/Makefile.am index 87a1d8314d..06f2b75ef4 100644 --- a/cpukit/libmisc/mw-fb/Makefile.am +++ b/cpukit/libmisc/mw-fb/Makefile.am @@ -9,13 +9,10 @@ LIBNAME = libmw-fb-tmp LIB = ${ARCH}/${LIBNAME}.a C_FILES = mw_fb.c mw_uid.c -C_O_FILES = $(C_FILES:%.c=${ARCH}/%.$(OBJEXT)) +OBJS = $(C_FILES:%.c=${ARCH}/%.$(OBJEXT)) include_rtems_HEADERS = mw_fb.h mw_uid.h -SRCS = $(C_FILES) -OBJS = $(C_O_FILES) - include $(top_srcdir)/../automake/compile.am include $(top_srcdir)/../automake/lib.am diff --git a/cpukit/libmisc/rtmonuse/Makefile.am b/cpukit/libmisc/rtmonuse/Makefile.am index 5cfe494ea3..e033125cc6 100644 --- a/cpukit/libmisc/rtmonuse/Makefile.am +++ b/cpukit/libmisc/rtmonuse/Makefile.am @@ -9,12 +9,10 @@ LIBNAME = librtmonuse-tmp LIB = $(ARCH)/$(LIBNAME).a C_FILES = rtmonuse.c -C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT)) +OBJS = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT)) include_rtems_HEADERS = rtmonuse.h -OBJS = $(C_O_FILES) - include $(top_srcdir)/../automake/compile.am include $(top_srcdir)/../automake/lib.am diff --git a/cpukit/libmisc/serdbg/Makefile.am b/cpukit/libmisc/serdbg/Makefile.am index adb807d433..04f641d54b 100644 --- a/cpukit/libmisc/serdbg/Makefile.am +++ b/cpukit/libmisc/serdbg/Makefile.am @@ -8,14 +8,12 @@ LIBNAME = libserdbg-tmp LIB = $(ARCH)/$(LIBNAME).a C_FILES = serdbg.c serdbgio.c termios_printk.c -C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT)) +OBJS = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT)) noinst_HEADERS = include_HEADERS = serdbgcnf.h serdbg.h termios_printk_cnf.h \ termios_printk.h -OBJS = $(C_O_FILES) - include $(top_srcdir)/../automake/compile.am include $(top_srcdir)/../automake/lib.am diff --git a/cpukit/libmisc/shell/Makefile.am b/cpukit/libmisc/shell/Makefile.am index 90f7b78e60..391a92f361 100644 --- a/cpukit/libmisc/shell/Makefile.am +++ b/cpukit/libmisc/shell/Makefile.am @@ -9,14 +9,12 @@ LIBNAME = libshell-tmp LIB = $(ARCH)/$(LIBNAME).a C_FILES = cmds.c shell.c -C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT)) +OBJS = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT)) if RTEMS_LIBSHELL include_rtems_HEADERS = shell.h endif -OBJS = $(C_O_FILES) - include $(top_srcdir)/../automake/compile.am include $(top_srcdir)/../automake/lib.am diff --git a/cpukit/libmisc/stackchk/Makefile.am b/cpukit/libmisc/stackchk/Makefile.am index fae7dfbe28..4a73216626 100644 --- a/cpukit/libmisc/stackchk/Makefile.am +++ b/cpukit/libmisc/stackchk/Makefile.am @@ -9,13 +9,11 @@ LIBNAME = libstackchk-tmp LIB = $(ARCH)/$(LIBNAME).a C_FILES = check.c -C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT)) +OBJS = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT)) noinst_HEADERS = internal.h include_rtems_HEADERS = stackchk.h -OBJS = $(C_O_FILES) - include $(top_srcdir)/../automake/compile.am include $(top_srcdir)/../automake/lib.am diff --git a/cpukit/libmisc/untar/Makefile.am b/cpukit/libmisc/untar/Makefile.am index bb819230ef..900bfb6de8 100644 --- a/cpukit/libmisc/untar/Makefile.am +++ b/cpukit/libmisc/untar/Makefile.am @@ -9,12 +9,10 @@ LIBNAME = libuntar-tmp LIB = $(ARCH)/$(LIBNAME).a C_FILES = untar.c -C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT)) +OBJS = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT)) include_rtems_HEADERS = untar.h -OBJS = $(C_O_FILES) - include $(top_srcdir)/../automake/compile.am include $(top_srcdir)/../automake/lib.am |