diff options
| author | Ralf Corsepius <ralf.corsepius@rtems.org> | 2002-07-31 05:48:15 +0000 |
|---|---|---|
| committer | Ralf Corsepius <ralf.corsepius@rtems.org> | 2002-07-31 05:48:15 +0000 |
| commit | c3214961812b760bf86b20b16afcae91037164bb (patch) | |
| tree | 6a556682c8a3ab09aa138a8a3b48147d6333e725 /cpukit/libblock | |
| parent | 2002-07-31 Ralf Corsepius <corsepiu@faw.uni-ulm.de> (diff) | |
| download | rtems-c3214961812b760bf86b20b16afcae91037164bb.tar.bz2 | |
2002-07-31 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* Makefile.am: Merge src/Makefile.am.
* src/Makefile.am: Remove.
* configure.ac: Remove src/Makefile.am
Diffstat (limited to 'cpukit/libblock')
| -rw-r--r-- | cpukit/libblock/ChangeLog | 6 | ||||
| -rw-r--r-- | cpukit/libblock/Makefile.am | 24 | ||||
| -rw-r--r-- | cpukit/libblock/configure.ac | 4 | ||||
| -rw-r--r-- | cpukit/libblock/src/Makefile.am | 25 |
4 files changed, 27 insertions, 32 deletions
diff --git a/cpukit/libblock/ChangeLog b/cpukit/libblock/ChangeLog index 42b89734b1..02c6f7e939 100644 --- a/cpukit/libblock/ChangeLog +++ b/cpukit/libblock/ChangeLog @@ -1,3 +1,9 @@ +2002-07-31 Ralf Corsepius <corsepiu@faw.uni-ulm.de> + + * Makefile.am: Merge src/Makefile.am. + * src/Makefile.am: Remove. + * configure.ac: Remove src/Makefile.am + 2002-07-22 Ralf Corsepius <corsepiu@faw.uni-ulm.de> * src/Makefile.am: Use .$(OBJEXT) instead of .o. diff --git a/cpukit/libblock/Makefile.am b/cpukit/libblock/Makefile.am index cbae75e203..22565e5b47 100644 --- a/cpukit/libblock/Makefile.am +++ b/cpukit/libblock/Makefile.am @@ -4,7 +4,9 @@ ACLOCAL_AMFLAGS = -I ../aclocal -SUBDIRS = src +include $(top_srcdir)/../automake/multilib.am +include $(top_srcdir)/../automake/compile.am +include $(top_srcdir)/../automake/lib.am include_rtemsdir = $(includedir)/rtems @@ -21,9 +23,23 @@ include_rtems_HEADERS = \ PREINSTALL_FILES = $(PROJECT_INCLUDE)/rtems \ $(include_rtems_HEADERS:include/%=$(PROJECT_INCLUDE)/%) -all-local: $(PREINSTALL_FILES) +LIB = ${ARCH}/libblock.a -EXTRA_DIST = README +C_FILES = src/bdbuf.c src/blkdev.c src/diskdevs.c src/ramdisk.c + +C_O_FILES = $(C_FILES:src/%.c=${ARCH}/%.$(OBJEXT)) + +SRCS = $(C_FILES) +OBJS = $(C_O_FILES) + +AM_CFLAGS += $(LIBC_DEFINES) + +${ARCH}/%.$(OBJEXT): src/%.c + ${COMPILE} -o $@ -c $< + +$(LIB): ${OBJS} + $(make-library) + +all-local: $(PREINSTALL_FILES) ${ARCH} $(LIB) -include $(top_srcdir)/../automake/subdirs.am include $(top_srcdir)/../automake/local.am diff --git a/cpukit/libblock/configure.ac b/cpukit/libblock/configure.ac index e302bcccac..4746f5d2cd 100644 --- a/cpukit/libblock/configure.ac +++ b/cpukit/libblock/configure.ac @@ -22,7 +22,5 @@ RTEMS_CANONICALIZE_TOOLS AC_PROG_RANLIB # Explicitly list all Makefiles here -AC_CONFIG_FILES([Makefile -src/Makefile -]) +AC_CONFIG_FILES([Makefile]) AC_OUTPUT diff --git a/cpukit/libblock/src/Makefile.am b/cpukit/libblock/src/Makefile.am deleted file mode 100644 index d1fdb00223..0000000000 --- a/cpukit/libblock/src/Makefile.am +++ /dev/null @@ -1,25 +0,0 @@ -## -## $Id$ -## - -LIB = ${ARCH}/libblock.a - -C_FILES = bdbuf.c blkdev.c diskdevs.c ramdisk.c - -C_O_FILES = $(C_FILES:%.c=${ARCH}/%.$(OBJEXT)) - -SRCS = $(C_FILES) -OBJS = $(C_O_FILES) - -include $(top_srcdir)/../automake/multilib.am -include $(top_srcdir)/../automake/compile.am -include $(top_srcdir)/../automake/lib.am - -AM_CFLAGS += $(LIBC_DEFINES) - -$(LIB): ${OBJS} - $(make-library) - -all-local: ${ARCH} $(LIB) - -include $(top_srcdir)/../automake/local.am |