volume_id: rename subdirectory

diff --git a/extras/volume_id/Makefile b/extras/volume_id/Makefile
index 88752b880e0ecbdfb66fe22cdc0408f28526d0c6..78dfd867bc6b41c62c290913fce867cce99a348c 100644 (file)
--- a/extras/volume_id/Makefile
+++ b/extras/volume_id/Makefile
@@ -31,12 +31,12 @@ all: $(PROG) $(MAN_PAGES)
        $(E) "  CC      " $@
        $(Q) $(CC) -c $(CFLAGS) $< -o $@
 
-libvolume_id/libvolume_id.a:
-       $(Q) $(MAKE) -C libvolume_id
+lib/libvolume_id.a:
+       $(Q) $(MAKE) -C lib
 
-$(PROG): %: $(HEADERS) %.o libvolume_id/libvolume_id.a
+$(PROG): %: $(HEADERS) %.o lib/libvolume_id.a
        $(E) "  LD      " $@
-       $(Q) $(LD) $(LDFLAGS) -o $@ $@.o $(LIBUDEV) libvolume_id/libvolume_id.a $(LIB_OBJS)
+       $(Q) $(LD) $(LDFLAGS) -o $@ $@.o $(LIBUDEV) lib/libvolume_id.a $(LIB_OBJS)
 ifneq ($(strip $(STRIPCMD)),)
        $(E) "  STRIP   " $@
        $(Q) $(STRIPCMD) $@
@@ -51,17 +51,17 @@ endif
 clean:
        $(E) "  CLEAN   "
        $(Q) rm -f $(PROG) $(OBJS) $(GEN_HEADERS)
-       $(Q) $(MAKE) -C libvolume_id clean
+       $(Q) $(MAKE) -C lib clean
 .PHONY: clean
 
 install-bin: all
        $(INSTALL_PROGRAM) -D $(PROG) $(DESTDIR)$(sbindir)/$(PROG)
-       $(MAKE) -C libvolume_id install
+       $(MAKE) -C lib install
 .PHONY: install-bin
 
 uninstall-bin:
        - rm $(DESTDIR)$(sbindir)/$(PROG)
-       $(MAKE) -C libvolume_id uninstall
+       $(MAKE) -C lib uninstall
 .PHONY: uninstall-bin
 
 install-man:

diff --git a/extras/volume_id/libvolume_id/Makefile b/extras/volume_id/lib/Makefile
similarity index 100%
rename from extras/volume_id/libvolume_id/Makefile
rename to extras/volume_id/lib/Makefile

diff --git a/extras/volume_id/libvolume_id/cramfs.c b/extras/volume_id/lib/cramfs.c
similarity index 100%
rename from extras/volume_id/libvolume_id/cramfs.c
rename to extras/volume_id/lib/cramfs.c

diff --git a/extras/volume_id/libvolume_id/ext.c b/extras/volume_id/lib/ext.c
similarity index 100%
rename from extras/volume_id/libvolume_id/ext.c
rename to extras/volume_id/lib/ext.c

diff --git a/extras/volume_id/libvolume_id/fat.c b/extras/volume_id/lib/fat.c
similarity index 100%
rename from extras/volume_id/libvolume_id/fat.c
rename to extras/volume_id/lib/fat.c

diff --git a/extras/volume_id/libvolume_id/hfs.c b/extras/volume_id/lib/hfs.c
similarity index 100%
rename from extras/volume_id/libvolume_id/hfs.c
rename to extras/volume_id/lib/hfs.c

diff --git a/extras/volume_id/libvolume_id/highpoint.c b/extras/volume_id/lib/highpoint.c
similarity index 100%
rename from extras/volume_id/libvolume_id/highpoint.c
rename to extras/volume_id/lib/highpoint.c

diff --git a/extras/volume_id/libvolume_id/hpfs.c b/extras/volume_id/lib/hpfs.c
similarity index 100%
rename from extras/volume_id/libvolume_id/hpfs.c
rename to extras/volume_id/lib/hpfs.c

diff --git a/extras/volume_id/libvolume_id/iso9660.c b/extras/volume_id/lib/iso9660.c
similarity index 100%
rename from extras/volume_id/libvolume_id/iso9660.c
rename to extras/volume_id/lib/iso9660.c

diff --git a/extras/volume_id/libvolume_id/isw_raid.c b/extras/volume_id/lib/isw_raid.c
similarity index 100%
rename from extras/volume_id/libvolume_id/isw_raid.c
rename to extras/volume_id/lib/isw_raid.c

diff --git a/extras/volume_id/libvolume_id/jfs.c b/extras/volume_id/lib/jfs.c
similarity index 100%
rename from extras/volume_id/libvolume_id/jfs.c
rename to extras/volume_id/lib/jfs.c

diff --git a/extras/volume_id/libvolume_id/libvolume_id.h b/extras/volume_id/lib/libvolume_id.h
similarity index 100%
rename from extras/volume_id/libvolume_id/libvolume_id.h
rename to extras/volume_id/lib/libvolume_id.h

diff --git a/extras/volume_id/libvolume_id/linux_raid.c b/extras/volume_id/lib/linux_raid.c
similarity index 100%
rename from extras/volume_id/libvolume_id/linux_raid.c
rename to extras/volume_id/lib/linux_raid.c

diff --git a/extras/volume_id/libvolume_id/linux_swap.c b/extras/volume_id/lib/linux_swap.c
similarity index 100%
rename from extras/volume_id/libvolume_id/linux_swap.c
rename to extras/volume_id/lib/linux_swap.c

diff --git a/extras/volume_id/libvolume_id/lsi_raid.c b/extras/volume_id/lib/lsi_raid.c
similarity index 100%
rename from extras/volume_id/libvolume_id/lsi_raid.c
rename to extras/volume_id/lib/lsi_raid.c

diff --git a/extras/volume_id/libvolume_id/luks.c b/extras/volume_id/lib/luks.c
similarity index 100%
rename from extras/volume_id/libvolume_id/luks.c
rename to extras/volume_id/lib/luks.c

diff --git a/extras/volume_id/libvolume_id/lvm.c b/extras/volume_id/lib/lvm.c
similarity index 100%
rename from extras/volume_id/libvolume_id/lvm.c
rename to extras/volume_id/lib/lvm.c

diff --git a/extras/volume_id/libvolume_id/minix.c b/extras/volume_id/lib/minix.c
similarity index 100%
rename from extras/volume_id/libvolume_id/minix.c
rename to extras/volume_id/lib/minix.c

diff --git a/extras/volume_id/libvolume_id/ntfs.c b/extras/volume_id/lib/ntfs.c
similarity index 100%
rename from extras/volume_id/libvolume_id/ntfs.c
rename to extras/volume_id/lib/ntfs.c

diff --git a/extras/volume_id/libvolume_id/nvidia_raid.c b/extras/volume_id/lib/nvidia_raid.c
similarity index 100%
rename from extras/volume_id/libvolume_id/nvidia_raid.c
rename to extras/volume_id/lib/nvidia_raid.c

diff --git a/extras/volume_id/libvolume_id/ocfs.c b/extras/volume_id/lib/ocfs.c
similarity index 100%
rename from extras/volume_id/libvolume_id/ocfs.c
rename to extras/volume_id/lib/ocfs.c

diff --git a/extras/volume_id/libvolume_id/promise_raid.c b/extras/volume_id/lib/promise_raid.c
similarity index 100%
rename from extras/volume_id/libvolume_id/promise_raid.c
rename to extras/volume_id/lib/promise_raid.c

diff --git a/extras/volume_id/libvolume_id/reiserfs.c b/extras/volume_id/lib/reiserfs.c
similarity index 100%
rename from extras/volume_id/libvolume_id/reiserfs.c
rename to extras/volume_id/lib/reiserfs.c

diff --git a/extras/volume_id/libvolume_id/romfs.c b/extras/volume_id/lib/romfs.c
similarity index 100%
rename from extras/volume_id/libvolume_id/romfs.c
rename to extras/volume_id/lib/romfs.c

diff --git a/extras/volume_id/libvolume_id/silicon_raid.c b/extras/volume_id/lib/silicon_raid.c
similarity index 100%
rename from extras/volume_id/libvolume_id/silicon_raid.c
rename to extras/volume_id/lib/silicon_raid.c

diff --git a/extras/volume_id/libvolume_id/squashfs.c b/extras/volume_id/lib/squashfs.c
similarity index 100%
rename from extras/volume_id/libvolume_id/squashfs.c
rename to extras/volume_id/lib/squashfs.c

diff --git a/extras/volume_id/libvolume_id/sysv.c b/extras/volume_id/lib/sysv.c
similarity index 100%
rename from extras/volume_id/libvolume_id/sysv.c
rename to extras/volume_id/lib/sysv.c

diff --git a/extras/volume_id/libvolume_id/udf.c b/extras/volume_id/lib/udf.c
similarity index 100%
rename from extras/volume_id/libvolume_id/udf.c
rename to extras/volume_id/lib/udf.c

diff --git a/extras/volume_id/libvolume_id/ufs.c b/extras/volume_id/lib/ufs.c
similarity index 100%
rename from extras/volume_id/libvolume_id/ufs.c
rename to extras/volume_id/lib/ufs.c

diff --git a/extras/volume_id/libvolume_id/util.c b/extras/volume_id/lib/util.c
similarity index 100%
rename from extras/volume_id/libvolume_id/util.c
rename to extras/volume_id/lib/util.c

diff --git a/extras/volume_id/libvolume_id/util.h b/extras/volume_id/lib/util.h
similarity index 100%
rename from extras/volume_id/libvolume_id/util.h
rename to extras/volume_id/lib/util.h

diff --git a/extras/volume_id/libvolume_id/via_raid.c b/extras/volume_id/lib/via_raid.c
similarity index 100%
rename from extras/volume_id/libvolume_id/via_raid.c
rename to extras/volume_id/lib/via_raid.c

diff --git a/extras/volume_id/libvolume_id/volume_id.c b/extras/volume_id/lib/volume_id.c
similarity index 100%
rename from extras/volume_id/libvolume_id/volume_id.c
rename to extras/volume_id/lib/volume_id.c

diff --git a/extras/volume_id/libvolume_id/vxfs.c b/extras/volume_id/lib/vxfs.c
similarity index 100%
rename from extras/volume_id/libvolume_id/vxfs.c
rename to extras/volume_id/lib/vxfs.c

diff --git a/extras/volume_id/libvolume_id/xfs.c b/extras/volume_id/lib/xfs.c
similarity index 100%
rename from extras/volume_id/libvolume_id/xfs.c
rename to extras/volume_id/lib/xfs.c

diff --git a/extras/volume_id/vol_id.c b/extras/volume_id/vol_id.c
index b086b3710ca65c1b19c589880a5bfd5d84c3073c..3a7361a6ac6f032d64073ed9b0d5b41b0e51b414 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 "libvolume_id/libvolume_id.h"
+#include "lib/libvolume_id.h"
 
 #define BLKGETSIZE64 _IOR(0x12,114,size_t)