volume_id: provide library

diff --git a/extras/volume_id/Makefile b/extras/volume_id/Makefile
index b72d5b11d98bc8ce5aa7e1cb54f1d2c3417b2b37..88752b880e0ecbdfb66fe22cdc0408f28526d0c6 100644 (file)
--- a/extras/volume_id/Makefile
+++ b/extras/volume_id/Makefile
@@ -1,12 +1,11 @@
 # Makefile for udev extra invoked from the udev main Makefile
 #
 # Makefile for udev extra invoked from the udev main Makefile
 #

-# Copyright (C) 2004-2005 Kay Sievers <kay.sievers@vrfy.org>
+# Copyright (C) 2004-2006 Kay Sievers <kay.sievers@vrfy.org>

 #
 # Released under the GNU General Public License, version 2.
 #
 
 PROG = vol_id
 #
 # Released under the GNU General Public License, version 2.
 #
 
 PROG = vol_id

-LIBVOLUME_ID = libvolume_id/libvolume_id.a

 GEN_HEADERS =
 MAN_PAGES =
 
 GEN_HEADERS =
 MAN_PAGES =
 


@@ -32,12 +31,12 @@ all: $(PROG) $(MAN_PAGES)
        $(E) "  CC      " $@
        $(Q) $(CC) -c $(CFLAGS) $< -o $@
 
        $(E) "  CC      " $@
        $(Q) $(CC) -c $(CFLAGS) $< -o $@
 

-$(LIBVOLUME_ID):
+libvolume_id/libvolume_id.a:

        $(Q) $(MAKE) -C libvolume_id
 
        $(Q) $(MAKE) -C libvolume_id
 

-$(PROG): %: $(HEADERS) %.o $(LIBVOLUME_ID)
+$(PROG): %: $(HEADERS) %.o libvolume_id/libvolume_id.a

        $(E) "  LD      " $@
        $(E) "  LD      " $@

-       $(Q) $(LD) $(LDFLAGS) $@.o $(LIBVOLUME_ID) -o $@ $(LIBUDEV) $(LIB_OBJS)
+       $(Q) $(LD) $(LDFLAGS) -o $@ $@.o $(LIBUDEV) libvolume_id/libvolume_id.a $(LIB_OBJS)

 ifneq ($(strip $(STRIPCMD)),)
        $(E) "  STRIP   " $@
        $(Q) $(STRIPCMD) $@
 ifneq ($(strip $(STRIPCMD)),)
        $(E) "  STRIP   " $@
        $(Q) $(STRIPCMD) $@


@@ -56,11 +55,13 @@ clean:
 .PHONY: clean
 
 install-bin: all
 .PHONY: clean
 
 install-bin: all

-       $(INSTALL_PROGRAM) $(PROG) $(DESTDIR)$(sbindir)/$(PROG)
+       $(INSTALL_PROGRAM) -D $(PROG) $(DESTDIR)$(sbindir)/$(PROG)
+       $(MAKE) -C libvolume_id install

 .PHONY: install-bin
 
 uninstall-bin:
        - rm $(DESTDIR)$(sbindir)/$(PROG)
 .PHONY: install-bin
 
 uninstall-bin:
        - rm $(DESTDIR)$(sbindir)/$(PROG)

+       $(MAKE) -C libvolume_id uninstall

 .PHONY: uninstall-bin
 
 install-man:
 .PHONY: uninstall-bin
 
 install-man:

diff --git a/extras/volume_id/libvolume_id/Makefile b/extras/volume_id/libvolume_id/Makefile
index a5f9c1a825bf5d421190250d73686ed9838025f6..5d188a23d42595ec542057325dd26e5862282401 100644 (file)
--- a/extras/volume_id/libvolume_id/Makefile
+++ b/extras/volume_id/libvolume_id/Makefile
@@ -1,11 +1,21 @@
-# Makefile for udev extra invoked from the udev main Makefile
+# libvolume_id - read filesystem label/uuid

 #
 #

-# Copyright (C) 2004-2005 Kay Sievers <kay.sievers@vrfy.org>
+# Copyright (C) 2004-2006 Kay Sievers <kay.sievers@vrfy.org>

 #
 # Released under the GNU General Public License, version 2.
 #
 #
 # Released under the GNU General Public License, version 2.
 #

+includedir =   ${prefix}/usr/include
+libdir =       ${prefix}/lib
+usrlibdir =    ${prefix}/usr/lib

 
 

-LIBVOLUME_ID = libvolume_id.a
+INSTALL = /usr/bin/install -c
+INSTALL_DATA  = ${INSTALL} -m 644
+INSTALL_LIB = ${INSTALL} -m 755
+
+SHLIB_CUR = 0
+SHLIB_REV = 60
+SHLIB_AGE = 0
+SHLIB = libvolume_id.so.$(SHLIB_CUR).$(SHLIB_REV).$(SHLIB_AGE)

 
 OBJS=                          \
        ext.o                   \
 
 OBJS=                          \
        ext.o                   \


@@ -41,13 +51,13 @@ OBJS=                               \
        util.o
 
 HEADERS=                       \
        util.o
 
 HEADERS=                       \

-       volume_id.h             \
+       libvolume_id.h          \

        util.h
 
 AR = $(CROSS)ar
 RANLIB = $(CROSS)ranlib
 
        util.h
 
 AR = $(CROSS)ar
 RANLIB = $(CROSS)ranlib
 

-all: $(LIBVOLUME_ID)
+all: libvolume_id.a $(SHLIB) libvolume_id.pc

 .PHONY: all
 .DEFAULT: all
 
 .PHONY: all
 .DEFAULT: all
 


@@ -55,15 +65,60 @@ all: $(LIBVOLUME_ID)
        $(E) "  CC      " $@
        $(Q) $(CC) -c $(CFLAGS) $< -o $@
 
        $(E) "  CC      " $@
        $(Q) $(CC) -c $(CFLAGS) $< -o $@
 

-$(LIBVOLUME_ID): $(HEADERS) $(OBJS)
+.shlib:
+       $(Q) mkdir .shlib
+
+.shlib/%.o: %.c
+       $(E) "  CC      " $@
+       $(Q) $(CC) -c $(CFLAGS) -fPIC $< -o $@
+
+libvolume_id.a: $(HEADERS) $(OBJS)

        $(Q) rm -f $@
        $(E) "  AR      " $@
        $(Q) $(AR) cq $@ $(OBJS)
        $(E) "  RANLIB  " $@
        $(Q) $(RANLIB) $@
 
        $(Q) rm -f $@
        $(E) "  AR      " $@
        $(Q) $(AR) cq $@ $(OBJS)
        $(E) "  RANLIB  " $@
        $(Q) $(RANLIB) $@
 

+$(SHLIB): $(HEADERS) .shlib $(addprefix .shlib/,$(OBJS))
+       $(E) "  CC      " $@
+       $(Q) $(CC) -shared $(CFLAGS) -o $@ -Wl,-soname,libvolume_id.so.$(SHLIB_CUR) $(addprefix .shlib/,$(OBJS))
+       $(Q) ln -sf $@ libvolume_id.so.$(SHLIB_CUR)
+       $(Q) ln -sf $@ libvolume_id.so
+
+libvolume_id.pc:
+       $(E) "  GENPC   " $@
+       $(Q) echo "prefix=${prefix}" > $@
+       $(Q) echo "libdir=${libdir}" >> $@
+       $(Q) echo "includedir=${includedir}" >> $@
+       $(Q) echo "" >> $@
+       $(Q) echo "Name: libvolume_id" >> $@
+       $(Q) echo "Description: Filesystem label and uuid access" >> $@
+       $(Q) echo "Version: $(SHLIB_CUR).$(SHLIB_REV).$(SHLIB_AGE)" >> $@
+       $(Q) echo "Libs: -L\$${libdir} -lvolume_id" >> $@
+       $(Q) echo "Cflags: -I\$${includedir}" >> $@
+
+install: all
+       $(INSTALL_DATA) -D libvolume_id.h $(DESTDIR)$(includedir)/libvolume_id.h
+       $(INSTALL_LIB) -D libvolume_id.a $(DESTDIR)$(usrlibdir)/libvolume_id.a
+       $(INSTALL_LIB) -D $(SHLIB) $(DESTDIR)$(libdir)/$(SHLIB)
+       ln -sf $(DESTDIR)$(libdir)/$(SHLIB) $(DESTDIR)$(libdir)/libvolume_id.so.$(SHLIB_CUR)
+       ln -sf $(DESTDIR)$(libdir)/$(SHLIB) $(DESTDIR)$(usrlibdir)/libvolume_id.so
+       $(INSTALL_DATA) -D libvolume_id.pc $(DESTDIR)$(usrlibdir)/pkgconfig/libvolume_id.pc
+.PHONY: install
+
+uninstall:
+       rm -f $(DESTDIR)$(includedir)/libvolume_id.h
+       rm -f $(DESTDIR)$(usrlibdir)/libvolume_id.a
+       rm -f $(DESTDIR)$(libdir)/$(SHLIB)
+       rm -f $(DESTDIR)$(libdir)/libvolume_id.so.$(SHLIB_CUR)
+       rm -f $(DESTDIR)$(libdir)/libvolume_id.so
+.PHONY: uninstall
+

 clean:
        $(E) "  CLEAN   "
 clean:
        $(E) "  CLEAN   "

-       $(Q) rm -f $(LIBVOLUME_ID) $(OBJS)
+       $(Q) rm -f libvolume_id.a $(OBJS)
+       $(Q) rm -f $(SHLIB) libvolume_id.so.$(SHLIB_CUR) libvolume_id.so
+       $(Q) rm -rf .shlib
+       $(Q) rm -f libvolume_id.pc

 .PHONY: clean
 
 .PHONY: clean
 

diff --git a/extras/volume_id/libvolume_id/cramfs.c b/extras/volume_id/libvolume_id/cramfs.c
index e099c214c864700f5f58fcd538d0688b7798c0ad..5a7c29d353dd03a8efcbb072b7c5a7f411088cba 100644 (file)
--- a/extras/volume_id/libvolume_id/cramfs.c
+++ b/extras/volume_id/libvolume_id/cramfs.c
@@ -23,7 +23,7 @@
 #include <errno.h>
 #include <ctype.h>
 
 #include <errno.h>
 #include <ctype.h>
 

-#include "volume_id.h"
+#include "libvolume_id.h"

 #include "logging.h"
 #include "util.h"
 
 #include "logging.h"
 #include "util.h"
 

diff --git a/extras/volume_id/libvolume_id/ext.c b/extras/volume_id/libvolume_id/ext.c
index 26ac98bc37bd14b724545496f254974a9d59c7ee..d1c46471c619c2297297aab422167f3c6bc140f0 100644 (file)
--- a/extras/volume_id/libvolume_id/ext.c
+++ b/extras/volume_id/libvolume_id/ext.c
@@ -23,7 +23,7 @@
 #include <errno.h>
 #include <ctype.h>
 
 #include <errno.h>
 #include <ctype.h>
 

-#include "volume_id.h"
+#include "libvolume_id.h"

 #include "util.h"
 #include "logging.h"
 
 #include "util.h"
 #include "logging.h"
 

diff --git a/extras/volume_id/libvolume_id/fat.c b/extras/volume_id/libvolume_id/fat.c
index a72ec19f5934ea2775921e127e13f1752f70b2df..4b32263fd6164065f3dd943525f63f88b712452a 100644 (file)
--- a/extras/volume_id/libvolume_id/fat.c
+++ b/extras/volume_id/libvolume_id/fat.c
@@ -23,7 +23,7 @@
 #include <errno.h>
 #include <ctype.h>
 
 #include <errno.h>
 #include <ctype.h>
 

-#include "volume_id.h"
+#include "libvolume_id.h"

 #include "logging.h"
 #include "util.h"
 
 #include "logging.h"
 #include "util.h"
 

diff --git a/extras/volume_id/libvolume_id/hfs.c b/extras/volume_id/libvolume_id/hfs.c
index 09194d5be126c319f8fc8ab531e151795f8f6757..627166df98dddf1c88ceba74097e8dbcb206e68c 100644 (file)
--- a/extras/volume_id/libvolume_id/hfs.c
+++ b/extras/volume_id/libvolume_id/hfs.c
@@ -23,7 +23,7 @@
 #include <errno.h>
 #include <ctype.h>
 
 #include <errno.h>
 #include <ctype.h>
 

-#include "volume_id.h"
+#include "libvolume_id.h"

 #include "logging.h"
 #include "util.h"
 
 #include "logging.h"
 #include "util.h"
 

diff --git a/extras/volume_id/libvolume_id/highpoint.c b/extras/volume_id/libvolume_id/highpoint.c
index 78a4ad82b4525f0203195e7332de4a5c9fb5a1cb..fa580b7b8c4f5972e99faf81c809e0bf4e48c18d 100644 (file)
--- a/extras/volume_id/libvolume_id/highpoint.c
+++ b/extras/volume_id/libvolume_id/highpoint.c
@@ -23,7 +23,7 @@
 #include <errno.h>
 #include <ctype.h>
 
 #include <errno.h>
 #include <ctype.h>
 

-#include "volume_id.h"
+#include "libvolume_id.h"

 #include "logging.h"
 #include "util.h"
 
 #include "logging.h"
 #include "util.h"
 

diff --git a/extras/volume_id/libvolume_id/hpfs.c b/extras/volume_id/libvolume_id/hpfs.c
index 452df0124dd09494fd7bae649433ffa7c7895945..41b8013bb1677b743ee62820664adbfe9825199b 100644 (file)
--- a/extras/volume_id/libvolume_id/hpfs.c
+++ b/extras/volume_id/libvolume_id/hpfs.c
@@ -23,7 +23,7 @@
 #include <errno.h>
 #include <ctype.h>
 
 #include <errno.h>
 #include <ctype.h>
 

-#include "volume_id.h"
+#include "libvolume_id.h"

 #include "logging.h"
 #include "util.h"
 
 #include "logging.h"
 #include "util.h"
 

diff --git a/extras/volume_id/libvolume_id/iso9660.c b/extras/volume_id/libvolume_id/iso9660.c
index 2e28af8d70c7af35f58509141421cda71dca1fc2..02575f8dc2b6d81aa25e27dd3bbf336ba393ad75 100644 (file)
--- a/extras/volume_id/libvolume_id/iso9660.c
+++ b/extras/volume_id/libvolume_id/iso9660.c
@@ -23,7 +23,7 @@
 #include <errno.h>
 #include <ctype.h>
 
 #include <errno.h>
 #include <ctype.h>
 

-#include "volume_id.h"
+#include "libvolume_id.h"

 #include "logging.h"
 #include "util.h"
 
 #include "logging.h"
 #include "util.h"
 

diff --git a/extras/volume_id/libvolume_id/isw_raid.c b/extras/volume_id/libvolume_id/isw_raid.c
index 72b2b85b1205b53ef4970bedb38f394aab0ee077..cf7c62f8175c0550592557e79862b8906b75b4d8 100644 (file)
--- a/extras/volume_id/libvolume_id/isw_raid.c
+++ b/extras/volume_id/libvolume_id/isw_raid.c
@@ -23,7 +23,7 @@
 #include <errno.h>
 #include <ctype.h>
 
 #include <errno.h>
 #include <ctype.h>
 

-#include "volume_id.h"
+#include "libvolume_id.h"

 #include "logging.h"
 #include "util.h"
 
 #include "logging.h"
 #include "util.h"
 

diff --git a/extras/volume_id/libvolume_id/jfs.c b/extras/volume_id/libvolume_id/jfs.c
index 78b61fb30d861ee2df49a3b51b16da8d3c2404ae..f8d857878db3475c031d967d6965db91a5b18c36 100644 (file)
--- a/extras/volume_id/libvolume_id/jfs.c
+++ b/extras/volume_id/libvolume_id/jfs.c
@@ -23,7 +23,7 @@
 #include <errno.h>
 #include <ctype.h>
 
 #include <errno.h>
 #include <ctype.h>
 

-#include "volume_id.h"
+#include "libvolume_id.h"

 #include "logging.h"
 #include "util.h"
 
 #include "logging.h"
 #include "util.h"
 

diff --git a/extras/volume_id/libvolume_id/volume_id.h b/extras/volume_id/libvolume_id/libvolume_id.h
similarity index 98%
rename from extras/volume_id/libvolume_id/volume_id.h
rename to extras/volume_id/libvolume_id/libvolume_id.h
index 8ddffc96de5f82fa01b8d2ccdf094ce61277dbca..b08a650dc80ac051de8cb0eff5275e76648dc147 100644 (file)
--- a/extras/volume_id/libvolume_id/volume_id.h
+++ b/extras/volume_id/libvolume_id/libvolume_id.h
@@ -8,14 +8,12 @@
  *     Free Software Foundation version 2 of the License.
  */
 
  *     Free Software Foundation version 2 of the License.
  */
 

-#ifndef _VOLUME_ID_H_
-#define _VOLUME_ID_H_
+#ifndef _LIBVOLUME_ID_H_
+#define _LIBVOLUME_ID_H_

 
 #include <stdint.h>
 #include <stddef.h>
 
 
 #include <stdint.h>
 #include <stddef.h>
 

-#define VOLUME_ID_VERSION              60
-

 #ifndef PACKED
 #define PACKED                         __attribute__((packed))
 #endif
 #ifndef PACKED
 #define PACKED                         __attribute__((packed))
 #endif

diff --git a/extras/volume_id/libvolume_id/linux_raid.c b/extras/volume_id/libvolume_id/linux_raid.c
index 2285e87b97412d3288bf2d2ebc08ca707e446fb4..ee5ed2875d6d38bc72286cf7fe8d66081175e52b 100644 (file)
--- a/extras/volume_id/libvolume_id/linux_raid.c
+++ b/extras/volume_id/libvolume_id/linux_raid.c
@@ -23,7 +23,7 @@
 #include <errno.h>
 #include <ctype.h>
 
 #include <errno.h>
 #include <ctype.h>
 

-#include "volume_id.h"
+#include "libvolume_id.h"

 #include "logging.h"
 #include "util.h"
 
 #include "logging.h"
 #include "util.h"
 

diff --git a/extras/volume_id/libvolume_id/linux_swap.c b/extras/volume_id/libvolume_id/linux_swap.c
index b4828347f7a169b096a9513865dadb4c568beedb..c87ef63df93bcb9b2be0ed321a997d34e1997379 100644 (file)
--- a/extras/volume_id/libvolume_id/linux_swap.c
+++ b/extras/volume_id/libvolume_id/linux_swap.c
@@ -23,7 +23,7 @@
 #include <errno.h>
 #include <ctype.h>
 
 #include <errno.h>
 #include <ctype.h>
 

-#include "volume_id.h"
+#include "libvolume_id.h"

 #include "logging.h"
 #include "util.h"
 
 #include "logging.h"
 #include "util.h"
 

diff --git a/extras/volume_id/libvolume_id/lsi_raid.c b/extras/volume_id/libvolume_id/lsi_raid.c
index efa792575f2720f8255827930aeaf8ec6719ac11..4e6c095b86f6562daf17d806357dc447280d6ab7 100644 (file)
--- a/extras/volume_id/libvolume_id/lsi_raid.c
+++ b/extras/volume_id/libvolume_id/lsi_raid.c
@@ -23,7 +23,7 @@
 #include <errno.h>
 #include <ctype.h>
 
 #include <errno.h>
 #include <ctype.h>
 

-#include "volume_id.h"
+#include "libvolume_id.h"

 #include "logging.h"
 #include "util.h"
 
 #include "logging.h"
 #include "util.h"
 

diff --git a/extras/volume_id/libvolume_id/luks.c b/extras/volume_id/libvolume_id/luks.c
index 43f326e17639717f1b7df213c51971f58687fa9f..5346450ecc7893a6a2a9031a4bc3dca78638454e 100644 (file)
--- a/extras/volume_id/libvolume_id/luks.c
+++ b/extras/volume_id/libvolume_id/luks.c
@@ -23,7 +23,7 @@
 #include <errno.h>
 #include <ctype.h>
 
 #include <errno.h>
 #include <ctype.h>
 

-#include "volume_id.h"
+#include "libvolume_id.h"

 #include "util.h"
 #include "logging.h"
 
 #include "util.h"
 #include "logging.h"
 

diff --git a/extras/volume_id/libvolume_id/lvm.c b/extras/volume_id/libvolume_id/lvm.c
index 074660b1e4c40d5d6cfb774dae190c30cde7a2e1..4a1620e8a42e9a39c759e42d430c166b75a73452 100644 (file)
--- a/extras/volume_id/libvolume_id/lvm.c
+++ b/extras/volume_id/libvolume_id/lvm.c
@@ -23,7 +23,7 @@
 #include <errno.h>
 #include <ctype.h>
 
 #include <errno.h>
 #include <ctype.h>
 

-#include "volume_id.h"
+#include "libvolume_id.h"

 #include "logging.h"
 #include "util.h"
 
 #include "logging.h"
 #include "util.h"
 

diff --git a/extras/volume_id/libvolume_id/minix.c b/extras/volume_id/libvolume_id/minix.c
index fefba8e729b65f6d7f33833dab2156996719d26f..957925fe1fbe92fc76ed8a31c0622ba3292ea37e 100644 (file)
--- a/extras/volume_id/libvolume_id/minix.c
+++ b/extras/volume_id/libvolume_id/minix.c
@@ -23,7 +23,7 @@
 #include <errno.h>
 #include <ctype.h>
 
 #include <errno.h>
 #include <ctype.h>
 

-#include "volume_id.h"
+#include "libvolume_id.h"

 #include "logging.h"
 #include "util.h"
 
 #include "logging.h"
 #include "util.h"
 

diff --git a/extras/volume_id/libvolume_id/ntfs.c b/extras/volume_id/libvolume_id/ntfs.c
index fe9ff8d5d6b32423b7d24a7a4492695149f8586a..a46359268eb55ed35e4ddb0f5221d13cd9501701 100644 (file)
--- a/extras/volume_id/libvolume_id/ntfs.c
+++ b/extras/volume_id/libvolume_id/ntfs.c
@@ -23,7 +23,7 @@
 #include <errno.h>
 #include <ctype.h>
 
 #include <errno.h>
 #include <ctype.h>
 

-#include "volume_id.h"
+#include "libvolume_id.h"

 #include "logging.h"
 #include "util.h"
 
 #include "logging.h"
 #include "util.h"
 

diff --git a/extras/volume_id/libvolume_id/nvidia_raid.c b/extras/volume_id/libvolume_id/nvidia_raid.c
index 24717aaaeccc5cf1bfe82a94eb2a1c35dd63af01..7e1b58ba55c7f64b18e39ba586068aeb0cb7a2cd 100644 (file)
--- a/extras/volume_id/libvolume_id/nvidia_raid.c
+++ b/extras/volume_id/libvolume_id/nvidia_raid.c
@@ -23,7 +23,7 @@
 #include <errno.h>
 #include <ctype.h>
 
 #include <errno.h>
 #include <ctype.h>
 

-#include "volume_id.h"
+#include "libvolume_id.h"

 #include "logging.h"
 #include "util.h"
 
 #include "logging.h"
 #include "util.h"
 

diff --git a/extras/volume_id/libvolume_id/ocfs.c b/extras/volume_id/libvolume_id/ocfs.c
index c2f8360cae18d50b56b522db2895ba15a91f0975..c55b7234f4343e843082e462584642a86ab1168d 100644 (file)
--- a/extras/volume_id/libvolume_id/ocfs.c
+++ b/extras/volume_id/libvolume_id/ocfs.c
@@ -24,7 +24,7 @@
 #include <errno.h>
 #include <ctype.h>
 
 #include <errno.h>
 #include <ctype.h>
 

-#include "volume_id.h"
+#include "libvolume_id.h"

 #include "logging.h"
 #include "util.h"
 
 #include "logging.h"
 #include "util.h"
 

diff --git a/extras/volume_id/libvolume_id/promise_raid.c b/extras/volume_id/libvolume_id/promise_raid.c
index bdf0c7b60159c7e2dac480f56465a065219b6764..f58dab28e9bcc729950869647e650c9b0abd8635 100644 (file)
--- a/extras/volume_id/libvolume_id/promise_raid.c
+++ b/extras/volume_id/libvolume_id/promise_raid.c
@@ -23,7 +23,7 @@
 #include <errno.h>
 #include <ctype.h>
 
 #include <errno.h>
 #include <ctype.h>
 

-#include "volume_id.h"
+#include "libvolume_id.h"

 #include "logging.h"
 #include "util.h"
 
 #include "logging.h"
 #include "util.h"
 

diff --git a/extras/volume_id/libvolume_id/reiserfs.c b/extras/volume_id/libvolume_id/reiserfs.c
index 91a5bcb9b0b558e426302b8449097592197fffb7..5a9d71b53d984ece320a46d1477585ef81285aa3 100644 (file)
--- a/extras/volume_id/libvolume_id/reiserfs.c
+++ b/extras/volume_id/libvolume_id/reiserfs.c
@@ -24,7 +24,7 @@
 #include <errno.h>
 #include <ctype.h>
 
 #include <errno.h>
 #include <ctype.h>
 

-#include "volume_id.h"
+#include "libvolume_id.h"

 #include "logging.h"
 #include "util.h"
 
 #include "logging.h"
 #include "util.h"
 

diff --git a/extras/volume_id/libvolume_id/romfs.c b/extras/volume_id/libvolume_id/romfs.c
index 456077d1e1d0f414ffe918f69689c00b2f09805c..171bb5a2a0a501f1785a439f8f5e80eb49c2191f 100644 (file)
--- a/extras/volume_id/libvolume_id/romfs.c
+++ b/extras/volume_id/libvolume_id/romfs.c
@@ -23,7 +23,7 @@
 #include <errno.h>
 #include <ctype.h>
 
 #include <errno.h>
 #include <ctype.h>
 

-#include "volume_id.h"
+#include "libvolume_id.h"

 #include "logging.h"
 #include "util.h"
 
 #include "logging.h"
 #include "util.h"
 

diff --git a/extras/volume_id/libvolume_id/silicon_raid.c b/extras/volume_id/libvolume_id/silicon_raid.c
index 27ac9591a7c27823c06fa43d8a1657412b0fd06f..e9ce4e0b78220e7eb91c8e8dabc54cc4bfef3ed3 100644 (file)
--- a/extras/volume_id/libvolume_id/silicon_raid.c
+++ b/extras/volume_id/libvolume_id/silicon_raid.c
@@ -23,7 +23,7 @@
 #include <errno.h>
 #include <ctype.h>
 
 #include <errno.h>
 #include <ctype.h>
 

-#include "volume_id.h"
+#include "libvolume_id.h"

 #include "logging.h"
 #include "util.h"
 
 #include "logging.h"
 #include "util.h"
 

diff --git a/extras/volume_id/libvolume_id/squashfs.c b/extras/volume_id/libvolume_id/squashfs.c
index f220721d7ba5dc47d90eeada058718abcdd5bc6d..3eabce71ae58e44c865abae8988e5d7601db9698 100644 (file)
--- a/extras/volume_id/libvolume_id/squashfs.c
+++ b/extras/volume_id/libvolume_id/squashfs.c
@@ -23,7 +23,7 @@
 #include <errno.h>
 #include <ctype.h>
 
 #include <errno.h>
 #include <ctype.h>
 

-#include "volume_id.h"
+#include "libvolume_id.h"

 #include "logging.h"
 #include "util.h"
 
 #include "logging.h"
 #include "util.h"
 

diff --git a/extras/volume_id/libvolume_id/sysv.c b/extras/volume_id/libvolume_id/sysv.c
index 4aa281e9fa8211ff11c561f7c904c9b6b9f92bbe..41a32bbaa26b37095d5cd7263b712a56cd933a05 100644 (file)
--- a/extras/volume_id/libvolume_id/sysv.c
+++ b/extras/volume_id/libvolume_id/sysv.c
@@ -23,7 +23,7 @@
 #include <errno.h>
 #include <ctype.h>
 
 #include <errno.h>
 #include <ctype.h>
 

-#include "volume_id.h"
+#include "libvolume_id.h"

 #include "logging.h"
 #include "util.h"
 
 #include "logging.h"
 #include "util.h"
 

diff --git a/extras/volume_id/libvolume_id/udf.c b/extras/volume_id/libvolume_id/udf.c
index f0e0d419572d28e32dc00bcf102d3205d0dcfe61..54e66b4e86aecc702002997987f8f68ea1f8cdd2 100644 (file)
--- a/extras/volume_id/libvolume_id/udf.c
+++ b/extras/volume_id/libvolume_id/udf.c
@@ -23,7 +23,7 @@
 #include <errno.h>
 #include <ctype.h>
 
 #include <errno.h>
 #include <ctype.h>
 

-#include "volume_id.h"
+#include "libvolume_id.h"

 #include "logging.h"
 #include "util.h"
 
 #include "logging.h"
 #include "util.h"
 

diff --git a/extras/volume_id/libvolume_id/ufs.c b/extras/volume_id/libvolume_id/ufs.c
index 2351d1f926c0b4ba2db55912f4aae8a45d527bca..be6fa9e9ea75a7e414b0b50f1b536986c2bdd2bb 100644 (file)
--- a/extras/volume_id/libvolume_id/ufs.c
+++ b/extras/volume_id/libvolume_id/ufs.c
@@ -23,7 +23,7 @@
 #include <errno.h>
 #include <ctype.h>
 
 #include <errno.h>
 #include <ctype.h>
 

-#include "volume_id.h"
+#include "libvolume_id.h"

 #include "logging.h"
 #include "util.h"
 
 #include "logging.h"
 #include "util.h"
 

diff --git a/extras/volume_id/libvolume_id/util.c b/extras/volume_id/libvolume_id/util.c
index 0ad8ce66b29d865fbe67e6d7a14c95c2a608f1eb..b49dd6dd14e7d7e56988fa6a73da7e5850e2a65e 100644 (file)
--- a/extras/volume_id/libvolume_id/util.c
+++ b/extras/volume_id/libvolume_id/util.c
@@ -25,7 +25,7 @@
 #include <fcntl.h>
 #include <sys/stat.h>
 
 #include <fcntl.h>
 #include <sys/stat.h>
 

-#include "volume_id.h"
+#include "libvolume_id.h"

 #include "logging.h"
 #include "util.h"
 
 #include "logging.h"
 #include "util.h"
 

diff --git a/extras/volume_id/libvolume_id/via_raid.c b/extras/volume_id/libvolume_id/via_raid.c
index 375a20979d432e4cda966b38b65f9207075044d4..e70cfa1241494474261b56d0b9f34645b637e7a0 100644 (file)
--- a/extras/volume_id/libvolume_id/via_raid.c
+++ b/extras/volume_id/libvolume_id/via_raid.c
@@ -23,7 +23,7 @@
 #include <errno.h>
 #include <ctype.h>
 
 #include <errno.h>
 #include <ctype.h>
 

-#include "volume_id.h"
+#include "libvolume_id.h"

 #include "logging.h"
 #include "util.h"
 
 #include "logging.h"
 #include "util.h"
 

diff --git a/extras/volume_id/libvolume_id/volume_id.c b/extras/volume_id/libvolume_id/volume_id.c
index 718d74e5b610b5e831988f5f6b59c4058293d9bd..e5f0d90ee8414068a95c273da592b3355f6b7182 100644 (file)
--- a/extras/volume_id/libvolume_id/volume_id.c
+++ b/extras/volume_id/libvolume_id/volume_id.c
@@ -26,7 +26,7 @@
 #include <fcntl.h>
 #include <sys/stat.h>
 
 #include <fcntl.h>
 #include <sys/stat.h>
 

-#include "volume_id.h"
+#include "libvolume_id.h"

 #include "logging.h"
 #include "util.h"
 
 #include "logging.h"
 #include "util.h"
 

diff --git a/extras/volume_id/libvolume_id/vxfs.c b/extras/volume_id/libvolume_id/vxfs.c
index 883c1266a4c37fc29861260eeda8555ec6a8fcc9..406391bf0e1be0c98017a2672b74c89a8f52029f 100644 (file)
--- a/extras/volume_id/libvolume_id/vxfs.c
+++ b/extras/volume_id/libvolume_id/vxfs.c
@@ -23,7 +23,7 @@
 #include <errno.h>
 #include <ctype.h>
 
 #include <errno.h>
 #include <ctype.h>
 

-#include "volume_id.h"
+#include "libvolume_id.h"

 #include "logging.h"
 #include "util.h"
 
 #include "logging.h"
 #include "util.h"
 

diff --git a/extras/volume_id/libvolume_id/xfs.c b/extras/volume_id/libvolume_id/xfs.c
index 934ed2d8771d209457f88529d7dbcd52e0fe7e53..4b48ff12505980fc79438b316838bd29bda2aea3 100644 (file)
--- a/extras/volume_id/libvolume_id/xfs.c
+++ b/extras/volume_id/libvolume_id/xfs.c
@@ -23,7 +23,7 @@
 #include <errno.h>
 #include <ctype.h>
 
 #include <errno.h>
 #include <ctype.h>
 

-#include "volume_id.h"
+#include "libvolume_id.h"

 #include "logging.h"
 #include "util.h"
 
 #include "logging.h"
 #include "util.h"
 

diff --git a/extras/volume_id/vol_id.c b/extras/volume_id/vol_id.c
index 6961969c13f63e466638398d537058136cb21108..518962c10bd5ddd6b649ef7910ff168ace04cc3d 100644 (file)
--- a/extras/volume_id/vol_id.c
+++ b/extras/volume_id/vol_id.c
@@ -31,7 +31,7 @@
 #include <sys/ioctl.h>
 
 #include "../../udev.h"
 #include <sys/ioctl.h>
 
 #include "../../udev.h"

-#include "libvolume_id/volume_id.h"
+#include "libvolume_id/libvolume_id.h"

 
 #define BLKGETSIZE64 _IOR(0x12,114,size_t)
 
 
 #define BLKGETSIZE64 _IOR(0x12,114,size_t)