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/src/Makefile.am | 9 ------ cpukit/libfs/src/dosfs/Makefile.am | 56 ------------------------------------ cpukit/libfs/src/imfs/Makefile.am | 58 -------------------------------------- 3 files changed, 123 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/src') 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