[Parted-commits] GNU Parted Official Repository: Changes to 'master'
Jim Meyering
meyering at alioth.debian.org
Tue Jan 10 11:52:40 UTC 2012
.gitignore | 24 +++++----
configure.ac | 11 ----
libparted/Makefile.am | 5 +-
libparted/fs/Makefile.am | 58 ++++++++++++++++--------
libparted/fs/amiga/Makefile.am | 17 -------
libparted/fs/amiga/a-interface.c | 87 ++++++++++++++++++++++++++++++++++++
libparted/fs/amiga/interface.c | 87 ------------------------------------
libparted/fs/ext2/Makefile.am | 11 ----
libparted/fs/fat/Makefile.am | 12 ----
libparted/fs/hfs/Makefile.am | 12 ----
libparted/fs/jfs/Makefile.am | 9 ---
libparted/fs/linux_swap/Makefile.am | 8 ---
libparted/fs/nilfs2/Makefile.am | 10 ----
libparted/fs/ntfs/Makefile.am | 9 ---
libparted/fs/reiserfs/Makefile.am | 10 ----
libparted/fs/ufs/Makefile.am | 9 ---
libparted/fs/xfs/Makefile.am | 9 ---
libparted/labels/Makefile.am | 3 -
libparted/tests/Makefile.am | 1
parted/Makefile.am | 3 -
partprobe/Makefile.am | 3 -
tests/Makefile.am | 1
22 files changed, 151 insertions(+), 248 deletions(-)
New commits:
commit e4f14df66735ad4f9eb2b7cd0a3f07fbf30a02f7
Author: Keshav P R <the.ridikulus.rat at gmail.com>
Date: Tue Jan 10 12:38:31 2012 +0100
build: insert -I$(top_builddir)/include before -I$(top_srcdir)/include
everywhere, for those who perform non-srcdir builds from a pristine
cloned directory. There is no problem when building from a tarball,
since that includes include/parted/*.h files under $(top_srcdir).
* libparted/Makefile.am: Insert it.
* libparted/fs/Makefile.am: Likewise.
* libparted/labels/Makefile.am: Likewise.
* libparted/tests/Makefile.am: Likewise.
* parted/Makefile.am: Likewise.
* partprobe/Makefile.am: Likewise.
* tests/Makefile.am: Likewise.
diff --git a/libparted/Makefile.am b/libparted/Makefile.am
index 4bc1939..bb7cc0e 100644
--- a/libparted/Makefile.am
+++ b/libparted/Makefile.am
@@ -18,8 +18,9 @@ AM_CFLAGS = $(WARN_CFLAGS) $(WERROR_CFLAGS)
SUBDIRS = labels fs . $(SUBDIRS_CHECK)
-partedincludedir = -I$(top_srcdir)/lib -I$(top_srcdir)/include
-lib_LTLIBRARIES = libparted.la
+partedincludedir = \
+ -I$(top_srcdir)/lib -I$(top_builddir)/include -I$(top_srcdir)/include
+lib_LTLIBRARIES = libparted.la
# Set the shared library version, per Libtool's guidelines.
# For details, see the "Updating library version information" section of
diff --git a/libparted/fs/Makefile.am b/libparted/fs/Makefile.am
index 0ce838c..1a3599a 100644
--- a/libparted/fs/Makefile.am
+++ b/libparted/fs/Makefile.am
@@ -3,7 +3,7 @@
#
# This file may be modified and/or distributed without restriction.
-partedincludedir = -I$(top_srcdir)/include
+partedincludedir = -I$(top_builddir)/include -I$(top_srcdir)/include
noinst_LTLIBRARIES = libfs.la
libfs_la_LDFLAGS = -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \
-release $(LT_RELEASE)
diff --git a/libparted/labels/Makefile.am b/libparted/labels/Makefile.am
index 967e537..7fe347b 100644
--- a/libparted/labels/Makefile.am
+++ b/libparted/labels/Makefile.am
@@ -12,7 +12,8 @@ endif
AM_CFLAGS = $(WARN_CFLAGS) $(WERROR_CFLAGS)
partedincludedir = \
- -I$(top_srcdir)/lib -I$(top_srcdir)/include -I$(top_srcdir)/libparted
+ -I$(top_srcdir)/lib -I$(top_builddir)/include -I$(top_srcdir)/include \
+ -I$(top_srcdir)/libparted
noinst_LTLIBRARIES = liblabels.la
liblabels_la_SOURCES = \
diff --git a/libparted/tests/Makefile.am b/libparted/tests/Makefile.am
index de8d03e..d857cdb 100644
--- a/libparted/tests/Makefile.am
+++ b/libparted/tests/Makefile.am
@@ -15,6 +15,7 @@ LDADD = \
AM_CPPFLAGS = \
$(CHECK_CFLAGS) \
-I$(top_srcdir)/lib \
+ -I$(top_builddir)/include \
-I$(top_srcdir)/include
label_SOURCES = common.h common.c label.c
diff --git a/parted/Makefile.am b/parted/Makefile.am
index 7b093c6..0b23693 100644
--- a/parted/Makefile.am
+++ b/parted/Makefile.am
@@ -3,7 +3,8 @@ BUILT_SOURCES =
sbin_PROGRAMS = parted
AM_CFLAGS = $(WARN_CFLAGS) $(WERROR_CFLAGS)
-partedincludedir = -I$(top_srcdir)/lib -I$(top_srcdir)/include
+partedincludedir = \
+ -I$(top_srcdir)/lib -I$(top_builddir)/include -I$(top_srcdir)/include
parted_SOURCES = command.c \
command.h \
diff --git a/partprobe/Makefile.am b/partprobe/Makefile.am
index f140991..7e3dea2 100644
--- a/partprobe/Makefile.am
+++ b/partprobe/Makefile.am
@@ -1,4 +1,5 @@
-partedincludedir = -I$(top_srcdir)/lib -I$(top_srcdir)/include
+partedincludedir = \
+ -I$(top_srcdir)/lib -I$(top_builddir)/include -I$(top_srcdir)/include
AM_CFLAGS = $(WARN_CFLAGS) $(WERROR_CFLAGS)
sbin_PROGRAMS = partprobe
diff --git a/tests/Makefile.am b/tests/Makefile.am
index f442204..34b3bc5 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -74,6 +74,7 @@ LDADD = \
$(top_builddir)/libparted/libparted.la
AM_CPPFLAGS = \
-I$(top_srcdir)/lib \
+ -I$(top_builddir)/include \
-I$(top_srcdir)/include
AM_CFLAGS = $(WARN_CFLAGS) $(WERROR_CFLAGS)
commit c5f0d9a4c056eac19754c4e03e76eaef91bcb6f9
Author: Jim Meyering <meyering at redhat.com>
Date: Tue Jan 10 12:38:50 2012 +0100
build: .gitignore: ignore more
diff --git a/.gitignore b/.gitignore
index 690bbbf..054d9ea 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,6 @@
*.[ao]
*.l[ao]
+*.trs
*~
.deps
.gdb-history
@@ -42,11 +43,16 @@ cscope.out
doc/C/po/parted.8.pot
doc/pt_BR/parted.8.pt_BR.po
gnulib-tests
-lib/.gitignore
-lib/charset.alias
-lib/config.h
-lib/config.h.in
-lib/configmake.h
+/lib/.gitignore
+/lib/charset.alias
+/lib/config.h
+/lib/config.h.in
+/lib/configmake.h
+/lib/arg-nonnull.h
+/lib/c++defs.h
+/lib/glthread/
+/lib/link-warning.h
+/lib/warn-on-use.h
libparted.pc
libparted/tests/disk
libparted/tests/init.sh
@@ -58,10 +64,8 @@ libparted/tests/zerolen
libtool
m4
maint.mk
-parted-*.tar.bz2
-parted-*.tar.bz2.sig
-parted-*.tar.gz
-parted-*.tar.gz.sig
+parted-*.tar.xz
+parted-*.tar.xz.sig
parted.spec
parted/version.c
parted/version.h
@@ -75,5 +79,5 @@ tests/help-version.log
tests/old-init.sh
tests/print-align
tests/print-max
-tests/t*.sh.log
+tests/t*.log
tests/test-suite.log
commit f8cae064c36d7086d6894a348eb80bcb7fe64835
Author: Jim Meyering <meyering at redhat.com>
Date: Tue Jan 10 11:48:52 2012 +0100
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.
diff --git a/configure.ac b/configure.ac
index a4bbe95..9f36089 100644
--- a/configure.ac
+++ b/configure.ac
@@ -605,17 +605,6 @@ include/parted/Makefile
libparted/Makefile
libparted/labels/Makefile
libparted/fs/Makefile
-libparted/fs/amiga/Makefile
-libparted/fs/ext2/Makefile
-libparted/fs/fat/Makefile
-libparted/fs/hfs/Makefile
-libparted/fs/jfs/Makefile
-libparted/fs/linux_swap/Makefile
-libparted/fs/ntfs/Makefile
-libparted/fs/reiserfs/Makefile
-libparted/fs/ufs/Makefile
-libparted/fs/xfs/Makefile
-libparted/fs/nilfs2/Makefile
libparted/tests/Makefile
libparted.pc
parted/Makefile
diff --git a/libparted/fs/Makefile.am b/libparted/fs/Makefile.am
index cb09ffb..0ce838c 100644
--- a/libparted/fs/Makefile.am
+++ b/libparted/fs/Makefile.am
@@ -3,9 +3,6 @@
#
# This file may be modified and/or distributed without restriction.
-SUBDIRS = amiga ext2 ufs fat ntfs hfs linux_swap xfs jfs reiserfs \
- nilfs2 # bfs
-
partedincludedir = -I$(top_srcdir)/include
noinst_LTLIBRARIES = libfs.la
libfs_la_LDFLAGS = -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \
@@ -13,22 +10,45 @@ libfs_la_LDFLAGS = -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \
libfs_la_LIBADD = $(UUID_LIBS) \
$(INTLLIBS) \
- $(OS_LIBS) \
- $(REISER_LIBS) \
- amiga/libamigafs.la \
- ext2/libext2.la \
- ufs/libufs.la \
- fat/libfat.la \
- ntfs/libntfs.la \
- hfs/libhfs.la \
- linux_swap/liblinuxswap.la \
- xfs/libxfs.la \
- jfs/libjfs.la \
- reiserfs/libreiserfs.la \
- nilfs2/libnilfs2.la
-# bfs/libbfs.la
+ $(OS_LIBS)
+
+libfs_la_SOURCES = \
+ amiga/affs.c \
+ amiga/affs.h \
+ amiga/amiga.c \
+ amiga/amiga.h \
+ amiga/apfs.c \
+ amiga/apfs.h \
+ amiga/asfs.c \
+ amiga/asfs.h \
+ amiga/a-interface.c \
+ ext2/ext2.h \
+ ext2/ext2_fs.h \
+ ext2/interface.c \
+ fat/bootsector.c \
+ fat/bootsector.h \
+ fat/count.h \
+ fat/fat.c \
+ fat/fat.h \
+ hfs/hfs.c \
+ hfs/hfs.h \
+ hfs/probe.c \
+ hfs/probe.h \
+ jfs/jfs.c \
+ jfs/jfs_superblock.h \
+ jfs/jfs_types.h \
+ linux_swap/linux_swap.c \
+ nilfs2/nilfs2.c \
+ ntfs/ntfs.c \
+ reiserfs/reiserfs.c \
+ reiserfs/reiserfs.h \
+ ufs/ufs.c \
+ xfs/platform_defs.h \
+ xfs/xfs.c \
+ xfs/xfs_sb.h \
+ xfs/xfs_types.h
-libfs_la_SOURCES =
+EXTRA_DIST = hfs/DOC hfs/HISTORY
INCLUDES = $(partedincludedir) $(INTLINCS)
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/a-interface.c b/libparted/fs/amiga/a-interface.c
new file mode 100644
index 0000000..a084266
--- /dev/null
+++ b/libparted/fs/amiga/a-interface.c
@@ -0,0 +1,87 @@
+/*
+ interface.c -- parted support amiga file systems
+ Copyright (C) 1998-2000, 2007, 2009-2012 Free Software Foundation, Inc.
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
+*/
+
+
+#include <config.h>
+
+#include <parted/parted.h>
+#include <parted/debug.h>
+#include <parted/endian.h>
+
+extern PedFileSystemType _affs0_type;
+extern PedFileSystemType _affs1_type;
+extern PedFileSystemType _affs2_type;
+extern PedFileSystemType _affs3_type;
+extern PedFileSystemType _affs4_type;
+extern PedFileSystemType _affs5_type;
+extern PedFileSystemType _affs6_type;
+extern PedFileSystemType _affs7_type;
+extern PedFileSystemType _amufs_type;
+extern PedFileSystemType _amufs0_type;
+extern PedFileSystemType _amufs1_type;
+extern PedFileSystemType _amufs2_type;
+extern PedFileSystemType _amufs3_type;
+extern PedFileSystemType _amufs4_type;
+extern PedFileSystemType _amufs5_type;
+extern PedFileSystemType _asfs_type;
+extern PedFileSystemType _apfs1_type;
+extern PedFileSystemType _apfs2_type;
+
+void ped_file_system_amiga_init ()
+{
+ ped_file_system_type_register (&_affs0_type);
+ ped_file_system_type_register (&_affs1_type);
+ ped_file_system_type_register (&_affs2_type);
+ ped_file_system_type_register (&_affs3_type);
+ ped_file_system_type_register (&_affs4_type);
+ ped_file_system_type_register (&_affs5_type);
+ ped_file_system_type_register (&_affs6_type);
+ ped_file_system_type_register (&_affs7_type);
+ ped_file_system_type_register (&_amufs_type);
+ ped_file_system_type_register (&_amufs0_type);
+ ped_file_system_type_register (&_amufs1_type);
+ ped_file_system_type_register (&_amufs2_type);
+ ped_file_system_type_register (&_amufs3_type);
+ ped_file_system_type_register (&_amufs4_type);
+ ped_file_system_type_register (&_amufs5_type);
+ ped_file_system_type_register (&_asfs_type);
+ ped_file_system_type_register (&_apfs1_type);
+ ped_file_system_type_register (&_apfs2_type);
+}
+
+void ped_file_system_amiga_done ()
+{
+ ped_file_system_type_unregister (&_affs0_type);
+ ped_file_system_type_unregister (&_affs1_type);
+ ped_file_system_type_unregister (&_affs2_type);
+ ped_file_system_type_unregister (&_affs3_type);
+ ped_file_system_type_unregister (&_affs4_type);
+ ped_file_system_type_unregister (&_affs5_type);
+ ped_file_system_type_unregister (&_affs6_type);
+ ped_file_system_type_unregister (&_affs7_type);
+ ped_file_system_type_unregister (&_amufs_type);
+ ped_file_system_type_unregister (&_amufs0_type);
+ ped_file_system_type_unregister (&_amufs1_type);
+ ped_file_system_type_unregister (&_amufs2_type);
+ ped_file_system_type_unregister (&_amufs3_type);
+ ped_file_system_type_unregister (&_amufs4_type);
+ ped_file_system_type_unregister (&_amufs5_type);
+ ped_file_system_type_unregister (&_asfs_type);
+ ped_file_system_type_unregister (&_apfs1_type);
+ ped_file_system_type_unregister (&_apfs2_type);
+}
diff --git a/libparted/fs/amiga/interface.c b/libparted/fs/amiga/interface.c
deleted file mode 100644
index a084266..0000000
--- a/libparted/fs/amiga/interface.c
+++ /dev/null
@@ -1,87 +0,0 @@
-/*
- interface.c -- parted support amiga file systems
- Copyright (C) 1998-2000, 2007, 2009-2012 Free Software Foundation, Inc.
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 3 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program. If not, see <http://www.gnu.org/licenses/>.
-*/
-
-
-#include <config.h>
-
-#include <parted/parted.h>
-#include <parted/debug.h>
-#include <parted/endian.h>
-
-extern PedFileSystemType _affs0_type;
-extern PedFileSystemType _affs1_type;
-extern PedFileSystemType _affs2_type;
-extern PedFileSystemType _affs3_type;
-extern PedFileSystemType _affs4_type;
-extern PedFileSystemType _affs5_type;
-extern PedFileSystemType _affs6_type;
-extern PedFileSystemType _affs7_type;
-extern PedFileSystemType _amufs_type;
-extern PedFileSystemType _amufs0_type;
-extern PedFileSystemType _amufs1_type;
-extern PedFileSystemType _amufs2_type;
-extern PedFileSystemType _amufs3_type;
-extern PedFileSystemType _amufs4_type;
-extern PedFileSystemType _amufs5_type;
-extern PedFileSystemType _asfs_type;
-extern PedFileSystemType _apfs1_type;
-extern PedFileSystemType _apfs2_type;
-
-void ped_file_system_amiga_init ()
-{
- ped_file_system_type_register (&_affs0_type);
- ped_file_system_type_register (&_affs1_type);
- ped_file_system_type_register (&_affs2_type);
- ped_file_system_type_register (&_affs3_type);
- ped_file_system_type_register (&_affs4_type);
- ped_file_system_type_register (&_affs5_type);
- ped_file_system_type_register (&_affs6_type);
- ped_file_system_type_register (&_affs7_type);
- ped_file_system_type_register (&_amufs_type);
- ped_file_system_type_register (&_amufs0_type);
- ped_file_system_type_register (&_amufs1_type);
- ped_file_system_type_register (&_amufs2_type);
- ped_file_system_type_register (&_amufs3_type);
- ped_file_system_type_register (&_amufs4_type);
- ped_file_system_type_register (&_amufs5_type);
- ped_file_system_type_register (&_asfs_type);
- ped_file_system_type_register (&_apfs1_type);
- ped_file_system_type_register (&_apfs2_type);
-}
-
-void ped_file_system_amiga_done ()
-{
- ped_file_system_type_unregister (&_affs0_type);
- ped_file_system_type_unregister (&_affs1_type);
- ped_file_system_type_unregister (&_affs2_type);
- ped_file_system_type_unregister (&_affs3_type);
- ped_file_system_type_unregister (&_affs4_type);
- ped_file_system_type_unregister (&_affs5_type);
- ped_file_system_type_unregister (&_affs6_type);
- ped_file_system_type_unregister (&_affs7_type);
- ped_file_system_type_unregister (&_amufs_type);
- ped_file_system_type_unregister (&_amufs0_type);
- ped_file_system_type_unregister (&_amufs1_type);
- ped_file_system_type_unregister (&_amufs2_type);
- ped_file_system_type_unregister (&_amufs3_type);
- ped_file_system_type_unregister (&_amufs4_type);
- ped_file_system_type_unregister (&_amufs5_type);
- ped_file_system_type_unregister (&_asfs_type);
- ped_file_system_type_unregister (&_apfs1_type);
- ped_file_system_type_unregister (&_apfs2_type);
-}
diff --git a/libparted/fs/ext2/Makefile.am b/libparted/fs/ext2/Makefile.am
deleted file mode 100644
index 0acd080..0000000
--- a/libparted/fs/ext2/Makefile.am
+++ /dev/null
@@ -1,11 +0,0 @@
-AM_CFLAGS = $(WARN_CFLAGS) $(WERROR_CFLAGS)
-partedincludedir = -I$(top_srcdir)/include
-
-noinst_LTLIBRARIES = libext2.la
-libext2_la_SOURCES = ext2.h \
- ext2_fs.h \
- interface.c
-
-INCLUDES = $(partedincludedir) $(INTLINCS)
-
-MAINTAINERCLEANFILES = Makefile.in
diff --git a/libparted/fs/fat/Makefile.am b/libparted/fs/fat/Makefile.am
deleted file mode 100644
index 9c975d7..0000000
--- a/libparted/fs/fat/Makefile.am
+++ /dev/null
@@ -1,12 +0,0 @@
-partedincludedir = -I$(top_srcdir)/include
-
-noinst_LTLIBRARIES = libfat.la
-libfat_la_SOURCES = bootsector.c \
- bootsector.h \
- count.h \
- fat.c \
- fat.h
-
-INCLUDES = $(partedincludedir) $(INTLINCS)
-
-MAINTAINERCLEANFILES = Makefile.in
diff --git a/libparted/fs/hfs/Makefile.am b/libparted/fs/hfs/Makefile.am
deleted file mode 100644
index f85493c..0000000
--- a/libparted/fs/hfs/Makefile.am
+++ /dev/null
@@ -1,12 +0,0 @@
-AM_CFLAGS = $(WARN_CFLAGS) $(WERROR_CFLAGS)
-partedincludedir = -I$(top_srcdir)/include
-
-noinst_LTLIBRARIES = libhfs.la
-libhfs_la_SOURCES = hfs.c hfs.h \
- probe.c probe.h
-
-INCLUDES = $(partedincludedir) $(INTLINCS)
-
-EXTRA_DIST = DOC HISTORY
-
-MAINTAINERCLEANFILES = Makefile.in
diff --git a/libparted/fs/jfs/Makefile.am b/libparted/fs/jfs/Makefile.am
deleted file mode 100644
index a477874..0000000
--- a/libparted/fs/jfs/Makefile.am
+++ /dev/null
@@ -1,9 +0,0 @@
-AM_CFLAGS = $(WARN_CFLAGS) $(WERROR_CFLAGS)
-partedincludedir = -I$(top_srcdir)/include
-
-noinst_LTLIBRARIES = libjfs.la
-libjfs_la_SOURCES = jfs.c jfs_superblock.h jfs_types.h
-
-INCLUDES = $(partedincludedir) $(INTLINCS)
-
-MAINTAINERCLEANFILES = Makefile.in
diff --git a/libparted/fs/linux_swap/Makefile.am b/libparted/fs/linux_swap/Makefile.am
deleted file mode 100644
index a366fc6..0000000
--- a/libparted/fs/linux_swap/Makefile.am
+++ /dev/null
@@ -1,8 +0,0 @@
-partedincludedir = -I$(top_srcdir)/include
-
-noinst_LTLIBRARIES = liblinuxswap.la
-liblinuxswap_la_SOURCES = linux_swap.c
-
-INCLUDES = $(partedincludedir) $(INTLINCS)
-
-MAINTAINERCLEANFILES = Makefile.in
diff --git a/libparted/fs/nilfs2/Makefile.am b/libparted/fs/nilfs2/Makefile.am
deleted file mode 100644
index c7cfd68..0000000
--- a/libparted/fs/nilfs2/Makefile.am
+++ /dev/null
@@ -1,10 +0,0 @@
-partedincludedir = -I$(top_srcdir)/include
-
-AM_CFLAGS = $(WARN_CFLAGS) $(WERROR_CFLAGS)
-
-noinst_LTLIBRARIES = libnilfs2.la
-libnilfs2_la_SOURCES = nilfs2.c
-
-INCLUDES = $(partedincludedir) $(INTLINCS)
-
-MAINTAINERCLEANFILES = Makefile.in
diff --git a/libparted/fs/ntfs/Makefile.am b/libparted/fs/ntfs/Makefile.am
deleted file mode 100644
index 732692a..0000000
--- a/libparted/fs/ntfs/Makefile.am
+++ /dev/null
@@ -1,9 +0,0 @@
-AM_CFLAGS = $(WARN_CFLAGS) $(WERROR_CFLAGS)
-partedincludedir = -I$(top_srcdir)/include
-
-noinst_LTLIBRARIES = libntfs.la
-libntfs_la_SOURCES = ntfs.c
-
-INCLUDES = $(partedincludedir) $(INTLINCS)
-
-MAINTAINERCLEANFILES = Makefile.in
diff --git a/libparted/fs/reiserfs/Makefile.am b/libparted/fs/reiserfs/Makefile.am
deleted file mode 100644
index 7df005a..0000000
--- a/libparted/fs/reiserfs/Makefile.am
+++ /dev/null
@@ -1,10 +0,0 @@
-AM_CFLAGS = $(WARN_CFLAGS) $(WERROR_CFLAGS)
-partedincludedir = -I$(top_srcdir)/include
-
-noinst_LTLIBRARIES = libreiserfs.la
-
-libreiserfs_la_SOURCES = reiserfs.c reiserfs.h
-
-INCLUDES = $(partedincludedir) $(INTLINCS)
-
-MAINTAINERCLEANFILES = Makefile.in
diff --git a/libparted/fs/ufs/Makefile.am b/libparted/fs/ufs/Makefile.am
deleted file mode 100644
index c63e8d2..0000000
--- a/libparted/fs/ufs/Makefile.am
+++ /dev/null
@@ -1,9 +0,0 @@
-AM_CFLAGS = $(WARN_CFLAGS) $(WERROR_CFLAGS)
-partedincludedir = -I$(top_srcdir)/include
-
-noinst_LTLIBRARIES = libufs.la
-libufs_la_SOURCES = ufs.c
-
-INCLUDES = $(partedincludedir) $(INTLINCS)
-
-MAINTAINERCLEANFILES = Makefile.in
diff --git a/libparted/fs/xfs/Makefile.am b/libparted/fs/xfs/Makefile.am
deleted file mode 100644
index 8e55052..0000000
--- a/libparted/fs/xfs/Makefile.am
+++ /dev/null
@@ -1,9 +0,0 @@
-AM_CFLAGS = $(WARN_CFLAGS) $(WERROR_CFLAGS)
-partedincludedir = -I$(top_srcdir)/include
-
-noinst_LTLIBRARIES = libxfs.la
-libxfs_la_SOURCES = xfs.c xfs_sb.h xfs_types.h platform_defs.h
-
-INCLUDES = $(partedincludedir) $(INTLINCS)
-
-MAINTAINERCLEANFILES = Makefile.in
More information about the Parted-commits
mailing list