Changeset 6ac4e84f in rtems

Timestamp:

Jan 11, 2004, 5:53:50 AM (16 years ago)

Author:

Ralf Corsepius <ralf.corsepius@…>

Branches:

4.10, 4.11, 4.8, 4.9, 5, master

Children:

dfbb492

Parents:

53fa63e

Message:

2004-01-11 Ralf Corsepius <corsepiu@…>

• Makefile.am: Include compile.am, again. Eliminate C_FILES. Reformat.

Location:

cpukit/libblock

Files:

• ChangeLog (modified) (1 diff)
• Makefile.am (modified) (2 diffs)

cpukit/libblock/ChangeLog

@@ +1 @@
+2004-01-11  Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+        * Makefile.am: Include compile.am, again.
+        Eliminate C_FILES. Reformat.
+
 2004-01-08  Ralf Corsepius <corsepiu@faw.uni-ulm.de>
 

cpukit/libblock/Makefile.am

@@ -4 +4 @@
 
 include $(top_srcdir)/automake/multilib.am
-include $(top_srcdir)/automake/amcompile.am
+include $(top_srcdir)/automake/compile.am
+
+AM_CPPFLAGS += -I$(top_builddir)
 
 include_rtemsdir = $(includedir)/rtems
+
+EXTRA_LIBRARIES = libblock.a
+CLEANFILES = libblock.a
+libblock_a_CPPFLAGS = $(AM_CPPFLAGS) $(LIBC_DEFINES) $(CFLAGS_OPTIMIZE_V)
+
+EXTRA_LIBRARIES += libblock_g.a
+CLEANFILES += libblock_g.a
+libblock_g_a_CPPFLAGS = $(AM_CPPFLAGS) $(LIBC_DEFINES) $(CFLAGS_DEBUG_V)
 
 include_rtems_HEADERS = include/rtems/bdbuf.h include/rtems/blkdev.h \
@@ -12 +22 @@
     include/rtems/ide_part_table.h
 
-C_FILES = src/bdbuf.c src/blkdev.c src/diskdevs.c src/ramdisk.c \
+libblock_a_SOURCES = src/bdbuf.c src/blkdev.c src/diskdevs.c src/ramdisk.c \
     src/ide_part_table.c
 
-EXTRA_LIBRARIES = libblock.a
-CLEANFILES = libblock.a
-libblock_a_SOURCES = $(C_FILES)
-libblock_a_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V)
-
-EXTRA_LIBRARIES += libblock_g.a
-CLEANFILES += libblock_g.a
 libblock_g_a_SOURCES = $(libblock_a_SOURCES)
-libblock_g_a_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V)
-
-AM_CPPFLAGS += -I$(top_builddir)
-AM_CPPFLAGS += $(LIBC_DEFINES)
 
 all-local: $(PREINSTALL_FILES) libblock$(LIB_VARIANT).a