diff options
| author | Ralf Corsepius <ralf.corsepius@rtems.org> | 2004-01-11 05:53:50 +0000 |
|---|---|---|
| committer | Ralf Corsepius <ralf.corsepius@rtems.org> | 2004-01-11 05:53:50 +0000 |
| commit | 6ac4e84f89775984820248bb1ec3e351367a9be4 (patch) | |
| tree | d1120715ab24840677f003e9cf408322e36d932e /cpukit | |
| parent | 2004-01-11 Ralf Corsepius <corsepiu@faw.uni-ulm.de> (diff) | |
| download | rtems-6ac4e84f89775984820248bb1ec3e351367a9be4.tar.bz2 | |
2004-01-11 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* Makefile.am: Include compile.am, again.
Eliminate C_FILES. Reformat.
Diffstat (limited to 'cpukit')
| -rw-r--r-- | cpukit/libblock/ChangeLog | 5 | ||||
| -rw-r--r-- | cpukit/libblock/Makefile.am | 25 |
2 files changed, 17 insertions, 13 deletions
diff --git a/cpukit/libblock/ChangeLog b/cpukit/libblock/ChangeLog index 0d3f670860..d9356d78bc 100644 --- a/cpukit/libblock/ChangeLog +++ b/cpukit/libblock/ChangeLog @@ -1,3 +1,8 @@ +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> * Makefile.am: Add libs to CLEANFILES diff --git a/cpukit/libblock/Makefile.am b/cpukit/libblock/Makefile.am index 7a8d8b5294..0550fcd00c 100644 --- a/cpukit/libblock/Makefile.am +++ b/cpukit/libblock/Makefile.am @@ -3,29 +3,28 @@ ## 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 \ include/rtems/diskdevs.h include/rtems/ramdisk.h \ 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 |