diff options
| author | Jim Meyering <meyering@redhat.com> | 2012-01-10 11:48:52 +0100 |
|---|---|---|
| committer | Jim Meyering <meyering@redhat.com> | 2012-01-10 12:26:40 +0100 |
| commit | f8cae064c36d7086d6894a348eb80bcb7fe64835 (patch) | |
| tree | 19c506536c37b8564c35664e541f981597a62454 /libparted/fs/amiga | |
| parent | b60dedf9796b87cfecf9044c6baff5a50b5733f6 (diff) | |
| download | parted-f8cae064c36d7086d6894a348eb80bcb7fe64835.tar.gz | |
maint: hoist libparted/fs/*/Makefile.am into parent Makefile.am
There was no need to have a separate Makefile.am for each file system
type, and a good reason *not* to do that (reduce duplication).
* configure.ac (AC_OUTPUT): Remove Makefiles.
* libparted/fs/Makefile.am (SUBDIRS): Remove.
(EXTRA_DIST): List the two non-src files: hfs/DOC hfs/HISTORY.
(libfs_la_SOURCES): Hoist file names to here from...
* libparted/fs/amiga/Makefile.am: ...here.
* libparted/fs/ext2/Makefile.am: Likewise.
* libparted/fs/fat/Makefile.am: Likewise.
* libparted/fs/hfs/Makefile.am: Likewise.
* libparted/fs/jfs/Makefile.am: Likewise.
* libparted/fs/linux_swap/Makefile.am: Likewise.
* libparted/fs/nilfs2/Makefile.am: Likewise.
* libparted/fs/ntfs/Makefile.am: Likewise.
* libparted/fs/reiserfs/Makefile.am: Likewise.
* libparted/fs/ufs/Makefile.am: Likewise.
* libparted/fs/xfs/Makefile.am: Likewise.
* libparted/fs/*/Makefile.am: Remove files.
* libparted/fs/amiga/a-interface.c: Now that the .o files are all
in the same place, rename from interface.c, to avoid collision with
name of .o file from ext2/interface.c.
Diffstat (limited to 'libparted/fs/amiga')
| -rw-r--r-- | libparted/fs/amiga/Makefile.am | 17 | ||||
| -rw-r--r-- | libparted/fs/amiga/a-interface.c (renamed from libparted/fs/amiga/interface.c) | 0 |
2 files changed, 0 insertions, 17 deletions
diff --git a/libparted/fs/amiga/Makefile.am b/libparted/fs/amiga/Makefile.am deleted file mode 100644 index 788ecac..0000000 --- a/libparted/fs/amiga/Makefile.am +++ /dev/null @@ -1,17 +0,0 @@ -AM_CFLAGS = $(WARN_CFLAGS) $(WERROR_CFLAGS) -partedincludedir = -I$(top_srcdir)/include - -noinst_LTLIBRARIES = libamigafs.la -libamigafs_la_SOURCES = amiga.h \ - amiga.c \ - affs.h \ - affs.c \ - asfs.h \ - asfs.c \ - apfs.h \ - apfs.c \ - interface.c - -INCLUDES = $(partedincludedir) $(INTLINCS) - -MAINTAINERCLEANFILES = Makefile.in diff --git a/libparted/fs/amiga/interface.c b/libparted/fs/amiga/a-interface.c index a084266..a084266 100644 --- a/libparted/fs/amiga/interface.c +++ b/libparted/fs/amiga/a-interface.c |