libmount: rename mount.h to libmount.h
The mount.h file name is too generic. Signed-off-by: Karel Zak <kzak@redhat.com>
This commit is contained in:
parent
dbde192307
commit
2a1f429ad0
|
@ -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):
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -32,7 +32,7 @@
|
|||
#include <assert.h>
|
||||
|
||||
#define USE_UNSTABLE_LIBMOUNT_API
|
||||
#include <mount.h>
|
||||
#include <libmount.h>
|
||||
|
||||
#include "pathnames.h"
|
||||
#include "nls.h"
|
||||
|
|
|
@ -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()
|
||||
{
|
||||
|
|
|
@ -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
|
||||
|
||||
|
|
|
@ -1,2 +1,2 @@
|
|||
test_*
|
||||
mount.h
|
||||
libmount.h
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -28,7 +28,8 @@
|
|||
#include <unistd.h>
|
||||
#include <sys/types.h>
|
||||
|
||||
#include "mount.h"
|
||||
#include <libmount.h>
|
||||
|
||||
#include "nls.h"
|
||||
#include "c.h"
|
||||
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -16,7 +16,7 @@
|
|||
|
||||
#define USE_UNSTABLE_LIBMOUNT_API
|
||||
|
||||
#include "mount.h"
|
||||
#include "libmount.h"
|
||||
#include "list.h"
|
||||
|
||||
/* features */
|
||||
|
|
Loading…
Reference in New Issue