diff options
author | Karel Zak | 2011-01-19 23:51:12 +0100 |
---|---|---|
committer | Karel Zak | 2011-01-22 00:27:26 +0100 |
commit | 2a1f429ad01dc00cd73f1f9ca39e6920687ea414 (patch) | |
tree | d5d3989e449fe092f4aa6bef05323818540c19f2 /shlibs/mount | |
parent | libmount: split mnt_context_do_mount() (diff) | |
download | kernel-qcow2-util-linux-2a1f429ad01dc00cd73f1f9ca39e6920687ea414.tar.gz kernel-qcow2-util-linux-2a1f429ad01dc00cd73f1f9ca39e6920687ea414.tar.xz kernel-qcow2-util-linux-2a1f429ad01dc00cd73f1f9ca39e6920687ea414.zip |
libmount: rename mount.h to libmount.h
The mount.h file name is too generic.
Signed-off-by: Karel Zak <kzak@redhat.com>
Diffstat (limited to 'shlibs/mount')
-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 |
7 files changed, 10 insertions, 9 deletions
diff --git a/shlibs/mount/.gitignore b/shlibs/mount/.gitignore index 1c7879deb..7d203f5f9 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 13e1c655f..3e087d294 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 94051b8b6..2c327978b 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 eca02d62e..aa7130013 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 f552ebee9..ceea6ab58 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 84f768477..84f768477 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 cb7b68cd3..f6c2e2117 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 */ |