diff options
author | Ralf Corsepius <ralf.corsepius@rtems.org> | 2004-01-07 17:48:16 +0000 |
---|---|---|
committer | Ralf Corsepius <ralf.corsepius@rtems.org> | 2004-01-07 17:48:16 +0000 |
commit | 07347cb5e79d1d651655e7975b69cb8a45243017 (patch) | |
tree | 0150c1398a86acf7b5e77a557abd596b737b89fc /cpukit/libfs | |
parent | 2004-01-07 Ralf Corsepius <corsepiu@faw.uni-ulm.de> (diff) | |
download | rtems-07347cb5e79d1d651655e7975b69cb8a45243017.tar.bz2 |
2004-01-07 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* Makefile.am: Build library using EXTRA_LIBRARIES and automake rules.
Diffstat (limited to '')
-rw-r--r-- | cpukit/libfs/ChangeLog | 4 | ||||
-rw-r--r-- | cpukit/libfs/Makefile.am | 46 |
2 files changed, 22 insertions, 28 deletions
diff --git a/cpukit/libfs/ChangeLog b/cpukit/libfs/ChangeLog index e52930a77a..f7ce69d887 100644 --- a/cpukit/libfs/ChangeLog +++ b/cpukit/libfs/ChangeLog @@ -1,3 +1,7 @@ +2004-01-07 Ralf Corsepius <corsepiu@faw.uni-ulm.de> + + * Makefile.am: Build library using EXTRA_LIBRARIES and automake rules. + 2003-12-12 Ralf Corsepius <corsepiu@faw.uni-ulm.de> * Makefile.am: Use mkdir_p. Remove dirs from PRE/TMPINSTALL_FILES. diff --git a/cpukit/libfs/Makefile.am b/cpukit/libfs/Makefile.am index dbe72ef4e8..962e5d4fb9 100644 --- a/cpukit/libfs/Makefile.am +++ b/cpukit/libfs/Makefile.am @@ -3,8 +3,7 @@ ## include $(top_srcdir)/automake/multilib.am -include $(top_srcdir)/automake/compile.am -include $(top_srcdir)/automake/lib.am +include $(top_srcdir)/automake/amcompile.am AM_CPPFLAGS += -I$(top_builddir) AM_CPPFLAGS += $(LIBC_DEFINES) @@ -14,7 +13,6 @@ EXTRA_DIST = README include_HEADERS = # imfs - libimfs_EMBEDDED_C_FILES = src/imfs/imfs_chown.c src/imfs/imfs_config.c \ src/imfs/imfs_creat.c src/imfs/imfs_directory.c src/imfs/imfs_eval.c \ src/imfs/imfs_free.c src/imfs/imfs_fsunmount.c src/imfs/imfs_gtkn.c \ @@ -38,21 +36,18 @@ libimfs_C_FILES = $(libimfs_UNIX_C_FILES) else libimfs_C_FILES = $(libimfs_EMBEDDED_C_FILES) endif -libimfs_OBJS = $(libimfs_C_FILES:src/imfs/%.c=src/imfs/$(ARCH)/%.$(OBJEXT)) -include_HEADERS += src/imfs/imfs.h +EXTRA_LIBRARIES = o-optimize/libimfs.a +o_optimize_libimfs_a_SOURCES = $(libimfs_C_FILES) +o_optimize_libimfs_a_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V) -IMFSLIB = src/imfs/$(ARCH)/libimfs.a +EXTRA_LIBRARIES += o-debug/libimfs.a +o_debug_libimfs_a_SOURCES = $(libimfs_C_FILES) +o_debug_libimfs_a_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V) -src/imfs/$(ARCH)/$(dirstamp): - @$(mkdir_p) src/imfs/$(ARCH) - @: > src/imfs/$(ARCH)/$(dirstamp) -src/imfs/$(ARCH)/%.$(OBJEXT): src/imfs/%.c src/imfs/$(ARCH)/$(dirstamp) - ${COMPILE} -o $@ -c $< -src/imfs/$(ARCH)/libimfs.a: ${libimfs_OBJS} - $(make-library) +include_HEADERS += src/imfs/imfs.h -EXTRA_DIST += $(libimfs_EMBEDDED_C_FILES) $(libimfs_UNIX_C_FILES) +IMFSLIB = $(ARCH)/libimfs.a # dosfs @@ -71,27 +66,22 @@ libdosfs_DOSFS_C_FILES = src/dosfs/msdos_create.c src/dosfs/msdos_dir.c \ if !UNIX libdosfs_C_FILES = $(libdosfs_FATFS_C_FILES) $(libdosfs_DOSFS_C_FILES) -libdosfs_OBJS = \ - $(libdosfs_C_FILES:src/dosfs/%.c=src/dosfs/${ARCH}/%.$(OBJEXT)) include_HEADERS += src/dosfs/dosfs.h -DOSFSLIB = src/dosfs/$(ARCH)/libdosfs.a +DOSFSLIB = $(ARCH)/libdosfs.a -src/dosfs/$(ARCH)/$(dirstamp): - @$(mkdir_p) src/dosfs/$(ARCH) - @: > src/dosfs/$(ARCH)/$(dirstamp) -src/dosfs/$(ARCH)/%.$(OBJEXT): src/dosfs/%.c src/dosfs/$(ARCH)/$(dirstamp) - ${COMPILE} -o $@ -c $< -src/dosfs/$(ARCH)/libdosfs.a: ${libdosfs_OBJS} - $(make-library) -endif +EXTRA_LIBRARIES += o-optimize/libdosfs.a +o_optimize_libdosfs_a_SOURCES = $(libdosfs_C_FILES) +o_optimize_libdosfs_a_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V) -all-local: $(IMFSLIB) $(DOSFSLIB) +EXTRA_LIBRARIES += o-debug/libdosfs.a +o_debug_libdosfs_a_SOURCES = $(libdosfs_C_FILES) +o_debug_libdosfs_a_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V) -EXTRA_DIST += $(libdosfs_DOSFS_C_FILES) $(libdosfs_FATFS_C_FILES) +endif -CLEANDIRS = src +all-local: $(PREINSTALL_FILES) $(IMFSLIB) $(DOSFSLIB) # --- |