From 7cdf8b7ec4f365e0941e4effe0db215eb20c8b74 Mon Sep 17 00:00:00 2001 From: Ralf Corsepius Date: Thu, 27 Nov 2003 16:59:19 +0000 Subject: 2003-11-27 Ralf Corsepius * Makefile.am: Merge-in src/Makefile.am, src/imfs/Makefile.am, src/dosfs/Makefile.am. * src/Makefile.am, src/imfs/Makefile.am, src/dosfs/Makefile.am: Removed. --- cpukit/libfs/ChangeLog | 7 +++ cpukit/libfs/Makefile.am | 102 ++++++++++++++++++++++++++++++++++++- cpukit/libfs/src/Makefile.am | 9 ---- cpukit/libfs/src/dosfs/Makefile.am | 56 -------------------- cpukit/libfs/src/imfs/Makefile.am | 58 --------------------- 5 files changed, 107 insertions(+), 125 deletions(-) delete mode 100644 cpukit/libfs/src/Makefile.am delete mode 100644 cpukit/libfs/src/dosfs/Makefile.am delete mode 100644 cpukit/libfs/src/imfs/Makefile.am (limited to 'cpukit/libfs') diff --git a/cpukit/libfs/ChangeLog b/cpukit/libfs/ChangeLog index 59d84d3c3c..4cf280791f 100644 --- a/cpukit/libfs/ChangeLog +++ b/cpukit/libfs/ChangeLog @@ -1,3 +1,10 @@ +2003-11-27 Ralf Corsepius + + * Makefile.am: Merge-in src/Makefile.am, src/imfs/Makefile.am, + src/dosfs/Makefile.am. + * src/Makefile.am, src/imfs/Makefile.am, src/dosfs/Makefile.am: + Removed. + 2003-11-20 Ralf Corsepius * src/dosfs/config.h: Remove. diff --git a/cpukit/libfs/Makefile.am b/cpukit/libfs/Makefile.am index 780b5e1e08..d13e11fb71 100644 --- a/cpukit/libfs/Makefile.am +++ b/cpukit/libfs/Makefile.am @@ -2,9 +2,107 @@ ## $Id$ ## -SUBDIRS = src +include $(top_srcdir)/automake/multilib.am +include $(top_srcdir)/automake/compile.am +include $(top_srcdir)/automake/lib.am + +AM_CPPFLAGS += -I$(top_builddir) +AM_CPPFLAGS += $(LIBC_DEFINES) EXTRA_DIST = README -include $(top_srcdir)/automake/subdirs.am +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 \ + src/imfs/imfs_init.c src/imfs/imfs_initsupp.c src/imfs/imfs_link.c \ + src/imfs/imfs_mknod.c src/imfs/imfs_mount.c src/imfs/imfs_fchmod.c \ + src/imfs/imfs_unlink.c src/imfs/imfs_unmount.c src/imfs/imfs_utime.c \ + src/imfs/imfs_ntype.c src/imfs/imfs_stat.c src/imfs/imfs_getchild.c \ + src/imfs/memfile.c src/imfs/linearfile.c src/imfs/deviceio.c \ + src/imfs/imfs_handlers_device.c src/imfs/imfs_handlers_directory.c \ + src/imfs/imfs_handlers_link.c src/imfs/imfs_handlers_memfile.c \ + src/imfs/imfs_debug.c src/imfs/imfs_rmnod.c src/imfs/imfs_symlink.c \ + src/imfs/imfs_readlink.c src/imfs/imfs_fdatasync.c src/imfs/imfs_fcntl.c \ + src/imfs/ioman.c src/imfs/miniimfs_init.c + +libimfs_UNUSED_C_FILES = src/imfs/imfs_load_tar.c + +libimfs_UNIX_C_FILES = src/imfs/imfs_unixstub.c + +if UNIX +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 + +IMFSLIB = src/imfs/$(ARCH) src/imfs/$(ARCH)/libimfs.a + +src/imfs/$(ARCH): + @$(mkinstalldirs) $@ +src/imfs/$(ARCH)/%.$(OBJEXT): src/imfs/%.c + ${COMPILE} -o $@ -c $< +src/imfs/$(ARCH)/libimfs.a: ${libimfs_OBJS} + $(make-library) + +EXTRA_DIST += $(libimfs_EMBEDDED_C_FILES) $(libimfs_UNIX_C_FILES) + +# dosfs + +noinst_HEADERS = src/dosfs/fat.h + +libdosfs_FATFS_C_FILES = src/dosfs/fat.c src/dosfs/fat_fat_operations.c \ + src/dosfs/fat_file.c + +libdosfs_DOSFS_C_FILES = src/dosfs/msdos_create.c src/dosfs/msdos_dir.c \ + src/dosfs/msdos_eval.c src/dosfs/msdos_file.c src/dosfs/msdos_free.c \ + src/dosfs/msdos_fsunmount.c src/dosfs/msdos_handlers_dir.c \ + src/dosfs/msdos_handlers_file.c src/dosfs/msdos_init.c \ + src/dosfs/msdos_initsupp.c src/dosfs/msdos_misc.c \ + src/dosfs/msdos_mknod.c src/dosfs/msdos_node_type.c \ + src/dosfs/msdos_conv.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} src/dosfs/$(ARCH)/libdosfs.a + +src/dosfs/$(ARCH): + @$(mkinstalldirs) $@ +src/dosfs/$(ARCH)/%.$(OBJEXT): src/dosfs/%.c + ${COMPILE} -o $@ -c $< +src/dosfs/$(ARCH)/libdosfs.a: ${libdosfs_OBJS} + $(make-library) +endif + +all-local: $(IMFSLIB) $(DOSFSLIB) + +EXTRA_DIST += $(libdosfs_DOSFS_C_FILES) $(libdosfs_FATFS_C_FILES) + +CLEANDIRS += src + +# --- + +PREINSTALL_FILES = + +$(PROJECT_INCLUDE)/imfs.h: src/imfs/imfs.h + $(INSTALL_DATA) $< $@ +PREINSTALL_FILES += $(PROJECT_INCLUDE)/imfs.h + +if !UNIX +$(PROJECT_INCLUDE)/dosfs.h: src/dosfs/dosfs.h + $(INSTALL_DATA) $< $@ +PREINSTALL_FILES += $(PROJECT_INCLUDE)/dosfs.h +endif + include $(top_srcdir)/automake/local.am diff --git a/cpukit/libfs/src/Makefile.am b/cpukit/libfs/src/Makefile.am deleted file mode 100644 index 5c6597fb83..0000000000 --- a/cpukit/libfs/src/Makefile.am +++ /dev/null @@ -1,9 +0,0 @@ -## -## $Id$ -## - - -SUBDIRS = imfs dosfs - -include $(top_srcdir)/automake/subdirs.am -include $(top_srcdir)/automake/local.am diff --git a/cpukit/libfs/src/dosfs/Makefile.am b/cpukit/libfs/src/dosfs/Makefile.am deleted file mode 100644 index 6dd10555a3..0000000000 --- a/cpukit/libfs/src/dosfs/Makefile.am +++ /dev/null @@ -1,56 +0,0 @@ -## -## $Id$ -## - - -include $(top_srcdir)/automake/multilib.am -include $(top_srcdir)/automake/compile.am -include $(top_srcdir)/automake/lib.am - -noinst_HEADERS = fat.h - -AM_CPPFLAGS += -I$(top_builddir) -AM_CPPFLAGS += $(LIBC_DEFINES) - -FATFS_C_FILES = fat.c fat_fat_operations.c fat_file.c - -DOSFS_C_FILES = msdos_create.c msdos_dir.c msdos_eval.c msdos_file.c \ - msdos_free.c msdos_fsunmount.c msdos_handlers_dir.c \ - msdos_handlers_file.c msdos_init.c msdos_initsupp.c \ - msdos_misc.c msdos_mknod.c msdos_node_type.c \ - msdos_conv.c - -if !UNIX -LIB = ${ARCH}/libdosfs.a - -C_FILES = $(FATFS_C_FILES) $(DOSFS_C_FILES) -OBJS = $(C_FILES:%.c=${ARCH}/%.$(OBJEXT)) - -include_HEADERS = dosfs.h - -H_FILES = $(PROJECT_INCLUDE) \ - $(include_HEADERS:%=$(PROJECT_INCLUDE)/%) - -PREINSTALL_FILES = $(PROJECT_INCLUDE) \ - $(include_HEADERS:%=$(PROJECT_INCLUDE)/%) - - -$(PROJECT_INCLUDE): - @$(mkinstalldirs) $@ - -$(PROJECT_INCLUDE)/%.h: %.h - $(INSTALL_DATA) $< $@ -# -# Add local stuff here using += -# -all-local: ${ARCH} $(LIB) - -$(LIB): ${OBJS} - $(make-library) -endif - -TMPINSTALL_FILES += $(H_FILES) - -EXTRA_DIST = $(DOSFS_C_FILES) $(FATFS_C_FILES) - -include $(top_srcdir)/automake/local.am diff --git a/cpukit/libfs/src/imfs/Makefile.am b/cpukit/libfs/src/imfs/Makefile.am deleted file mode 100644 index 80cd1c432e..0000000000 --- a/cpukit/libfs/src/imfs/Makefile.am +++ /dev/null @@ -1,58 +0,0 @@ -## -## $Id$ -## - -LIB = ${ARCH}/libimfs.a - -IMFS_C_FILES = imfs_chown.c imfs_config.c imfs_creat.c imfs_directory.c \ - imfs_eval.c imfs_free.c imfs_fsunmount.c imfs_gtkn.c imfs_init.c \ - imfs_initsupp.c imfs_link.c imfs_mknod.c imfs_mount.c imfs_fchmod.c \ - imfs_unlink.c imfs_unmount.c imfs_utime.c imfs_ntype.c imfs_stat.c \ - imfs_getchild.c memfile.c linearfile.c deviceio.c imfs_handlers_device.c \ - imfs_handlers_directory.c imfs_handlers_link.c imfs_handlers_memfile.c \ - imfs_debug.c imfs_rmnod.c imfs_symlink.c imfs_readlink.c imfs_fdatasync.c \ - imfs_fcntl.c ioman.c miniimfs_init.c - -# imfs_load_tar.c - -UNIX_C_FILES = imfs_unixstub.c - -EMBEDDED_C_FILES = $(IMFS_C_FILES) - -if UNIX -C_FILES = $(UNIX_C_FILES) -else -C_FILES = $(EMBEDDED_C_FILES) -endif -OBJS = $(C_FILES:%.c=${ARCH}/%.$(OBJEXT)) - -include_HEADERS = imfs.h - -include $(top_srcdir)/automake/multilib.am -include $(top_srcdir)/automake/compile.am -include $(top_srcdir)/automake/lib.am - -AM_CPPFLAGS += -I$(top_builddir) -AM_CPPFLAGS += $(LIBC_DEFINES) - -PREINSTALL_FILES = $(PROJECT_INCLUDE) \ - $(include_HEADERS:%=$(PROJECT_INCLUDE)/%) - -$(PROJECT_INCLUDE): - @$(mkinstalldirs) $@ - -$(PROJECT_INCLUDE)/%.h: %.h - $(INSTALL_DATA) $< $@ - -# -# Add local stuff here using += -# - -all-local: ${ARCH} $(LIB) - -$(LIB): ${OBJS} - $(make-library) - -EXTRA_DIST = $(EMBEDDED_C_FILES) $(UNIX_C_FILES) - -include $(top_srcdir)/automake/local.am -- cgit v1.2.3