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
This commit is contained in:
Ralf Corsepius
2002-07-31 05:48:15 +00:00
parent e6cf7a3b6f
commit c321496181
4 changed files with 27 additions and 32 deletions

View File

@@ -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.

View File

@@ -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

View File

@@ -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

View File

@@ -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