volume_id: add md metadata 1.0, 1.1, 1.2 support

[elogind.git] / extras / volume_id / lib / Makefile

diff --git a/extras/volume_id/lib/Makefile b/extras/volume_id/lib/Makefile
index f69df5f5ca43f19f690353c24344dea3926441e9..41b7ecb7af83b0283d2e645363c32b4c20b08908 100644 (file)
--- a/extras/volume_id/lib/Makefile
+++ b/extras/volume_id/lib/Makefile
@@ -8,12 +8,12 @@ includedir =  ${prefix}/usr/include
 libdir =       ${prefix}/lib
 usrlibdir =    ${prefix}/usr/lib
 
-INSTALL = /usr/bin/install -c
+INSTALL = install -c
 INSTALL_DATA  = ${INSTALL} -m 644
 INSTALL_LIB = ${INSTALL} -m 755
 
 SHLIB_CUR = 0
-SHLIB_REV = 61
+SHLIB_REV = 76
 SHLIB_AGE = 0
 SHLIB = libvolume_id.so.$(SHLIB_CUR).$(SHLIB_REV).$(SHLIB_AGE)
 
@@ -28,6 +28,8 @@ OBJS=                         \
        silicon_raid.o          \
        nvidia_raid.o           \
        promise_raid.o          \
+       adaptec_raid.o          \
+       jmicron_raid.o          \
        iso9660.o               \
        jfs.o                   \
        linux_raid.o            \
@@ -43,10 +45,12 @@ OBJS=                               \
        romfs.o                 \
        sysv.o                  \
        minix.o                 \
+       gfs.o                   \
        luks.o                  \
        ocfs.o                  \
        vxfs.o                  \
        squashfs.o              \
+       netware.o               \
        volume_id.o             \
        util.o
 
@@ -54,9 +58,6 @@ HEADERS=                      \
        libvolume_id.h          \
        util.h
 
-AR = $(CROSS)ar
-RANLIB = $(CROSS)ranlib
-
 all: libvolume_id.a $(SHLIB) libvolume_id.pc
 .PHONY: all
 .DEFAULT: all
@@ -101,10 +102,10 @@ libvolume_id.pc:
 
 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
+       mkdir -p $(DESTDIR)$(usrlibdir)/
+       ln -sf $(SHLIB) $(DESTDIR)$(libdir)/libvolume_id.so.$(SHLIB_CUR)
+       ln -sf $(libdir)/$(SHLIB) $(DESTDIR)$(usrlibdir)/libvolume_id.so
        $(INSTALL_DATA) -D libvolume_id.pc $(DESTDIR)$(usrlibdir)/pkgconfig/libvolume_id.pc
 .PHONY: install