diff options
| -rw-r--r-- | config/include-Makefile.am | 2 | ||||
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | misc-utils/findmnt.c | 2 | ||||
| -rw-r--r-- | mount/fstab.c | 2 | ||||
| -rw-r--r-- | mount/fstab.h | 2 | ||||
| -rw-r--r-- | shlibs/mount/.gitignore | 2 | ||||
| -rw-r--r-- | shlibs/mount/docs/Makefile.am | 2 | ||||
| -rw-r--r-- | shlibs/mount/mount.pc.in | 2 | ||||
| -rw-r--r-- | shlibs/mount/samples/mount.c | 3 | ||||
| -rw-r--r-- | shlibs/mount/src/Makefile.am | 8 | ||||
| -rw-r--r-- | shlibs/mount/src/libmount.h.in (renamed from shlibs/mount/src/mount.h.in) | 0 | ||||
| -rw-r--r-- | shlibs/mount/src/mountP.h | 2 |
12 files changed, 15 insertions, 14 deletions
diff --git a/config/include-Makefile.am b/config/include-Makefile.am index e7dbd34e..b9caad5a 100644 --- a/config/include-Makefile.am +++ b/config/include-Makefile.am @@ -37,7 +37,7 @@ ul_libmount_srcdir = $(top_srcdir)/shlibs/mount/src ul_libmount_builddir = $(top_builddir)/shlibs/mount/src ul_libmount_la = $(top_builddir)/shlibs/mount/src/libmount.la -# mount.h is generated by ./configure script and stored in build directory +# libmount.h is generated by ./configure script and stored in build directory ul_libmount_incdir = $(ul_libmount_builddir) $(ul_libmount_la): diff --git a/configure.ac b/configure.ac index 3c241e91..246afd4f 100644 --- a/configure.ac +++ b/configure.ac @@ -1207,7 +1207,7 @@ shlibs/blkid/samples/Makefile shlibs/mount/mount.pc shlibs/mount/Makefile shlibs/mount/src/Makefile -shlibs/mount/src/mount.h +shlibs/mount/src/libmount.h shlibs/mount/docs/Makefile shlibs/mount/docs/version.xml shlibs/mount/samples/Makefile diff --git a/misc-utils/findmnt.c b/misc-utils/findmnt.c index af5d6e04..edf14ebe 100644 --- a/misc-utils/findmnt.c +++ b/misc-utils/findmnt.c @@ -32,7 +32,7 @@ #include <assert.h> #define USE_UNSTABLE_LIBMOUNT_API -#include <mount.h> +#include <libmount.h> #include "pathnames.h" #include "nls.h" diff --git a/mount/fstab.c b/mount/fstab.c index 2d3767ab..f812e120 100644 --- a/mount/fstab.c +++ b/mount/fstab.c @@ -151,7 +151,7 @@ read_mntentchn(mntFILE *mfp, const char *fnam, struct mntentchn *mc0) { #ifdef HAVE_LIBMOUNT_MOUNT #define USE_UNSTABLE_LIBMOUNT_API -#include <mount.h> /* libmount */ +#include <libmount.h> /* libmount */ static void read_mounttable() { diff --git a/mount/fstab.h b/mount/fstab.h index f8ec4ef2..09e995c1 100644 --- a/mount/fstab.h +++ b/mount/fstab.h @@ -5,7 +5,7 @@ #ifdef HAVE_LIBMOUNT_MOUNT #define USE_UNSTABLE_LIBMOUNT_API -#include <mount.h> /* libmount */ +#include <libmount.h> extern mnt_lock *init_libmount_lock(const char *filename); #endif diff --git a/shlibs/mount/.gitignore b/shlibs/mount/.gitignore index 1c7879de..7d203f5f 100644 --- a/shlibs/mount/.gitignore +++ b/shlibs/mount/.gitignore @@ -1,2 +1,2 @@ test_* -mount.h +libmount.h diff --git a/shlibs/mount/docs/Makefile.am b/shlibs/mount/docs/Makefile.am index 13e1c655..3e087d29 100644 --- a/shlibs/mount/docs/Makefile.am +++ b/shlibs/mount/docs/Makefile.am @@ -50,7 +50,7 @@ FIXXREF_OPTIONS= # Used for dependencies. The docs will be rebuilt if any of these change. # e.g. HFILE_GLOB=$(top_srcdir)/gtk/*.h # e.g. CFILE_GLOB=$(top_srcdir)/gtk/*.c -HFILE_GLOB=$(ul_libmount_incdir)/mount.h +HFILE_GLOB=$(ul_libmount_incdir)/libmount.h CFILE_GLOB=$(ul_libmount_srcdir)/*.c # Extra header to include when scanning, which are not under DOC_SOURCE_DIR diff --git a/shlibs/mount/mount.pc.in b/shlibs/mount/mount.pc.in index 94051b8b..2c327978 100644 --- a/shlibs/mount/mount.pc.in +++ b/shlibs/mount/mount.pc.in @@ -7,5 +7,5 @@ Name: mount Description: mount library Version: @LIBMOUNT_VERSION@ Requires.private: blkid -Cflags: -I${includedir}/mount +Cflags: -I${includedir}/libmount Libs: -L${libdir} -lmount diff --git a/shlibs/mount/samples/mount.c b/shlibs/mount/samples/mount.c index eca02d62..aa713001 100644 --- a/shlibs/mount/samples/mount.c +++ b/shlibs/mount/samples/mount.c @@ -28,7 +28,8 @@ #include <unistd.h> #include <sys/types.h> -#include "mount.h" +#include <libmount.h> + #include "nls.h" #include "c.h" diff --git a/shlibs/mount/src/Makefile.am b/shlibs/mount/src/Makefile.am index f552ebee..ceea6ab5 100644 --- a/shlibs/mount/src/Makefile.am +++ b/shlibs/mount/src/Makefile.am @@ -5,8 +5,8 @@ AM_CPPFLAGS += -I$(ul_libmount_incdir) \ -I$(ul_libblkid_incdir) # includes -mountincdir = $(includedir)/mount -nodist_mountinc_HEADERS = mount.h +mountincdir = $(includedir)/libmount +nodist_mountinc_HEADERS = libmount.h usrlib_exec_LTLIBRARIES = libmount.la libmount_la_SOURCES = mountP.h version.c utils.c test.c init.c cache.c \ @@ -25,7 +25,7 @@ nodist_libmount_la_SOURCES = mountP.h libmount_la_LIBADD = $(ul_libblkid_la) $(SELINUX_LIBS) -libmount_la_DEPENDENCIES = $(libmount_la_LIBADD) mount.sym mount.h.in +libmount_la_DEPENDENCIES = $(libmount_la_LIBADD) mount.sym libmount.h.in libmount_la_LDFLAGS = -Wl,--version-script=$(ul_libmount_srcdir)/mount.sym \ -version-info $(LIBMOUNT_VERSION_INFO) @@ -36,7 +36,7 @@ if HAVE_SELINUX TESTS_LIBS += $(SELINUX_LIBS) endif -EXTRA_DIST = mount.sym mount.h.in +EXTRA_DIST = mount.sym libmount.h.in CLEANFILES = $(tests) # move lib from $(usrlib_execdir) to $(libdir) if needed diff --git a/shlibs/mount/src/mount.h.in b/shlibs/mount/src/libmount.h.in index 84f76847..84f76847 100644 --- a/shlibs/mount/src/mount.h.in +++ b/shlibs/mount/src/libmount.h.in diff --git a/shlibs/mount/src/mountP.h b/shlibs/mount/src/mountP.h index cb7b68cd..f6c2e211 100644 --- a/shlibs/mount/src/mountP.h +++ b/shlibs/mount/src/mountP.h @@ -16,7 +16,7 @@ #define USE_UNSTABLE_LIBMOUNT_API -#include "mount.h" +#include "libmount.h" #include "list.h" /* features */ |