volume_id: add DDF support

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

diff --git a/extras/volume_id/lib/Makefile b/extras/volume_id/lib/Makefile
index e93f8b5af5936878471168e1d7b1aa1575f331cf..b73172e37e5cf03ae36e1e062d709e1c672e4858 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 = 70
+SHLIB_REV = 77
 SHLIB_AGE = 0
 SHLIB = libvolume_id.so.$(SHLIB_CUR).$(SHLIB_REV).$(SHLIB_AGE)
 
@@ -30,6 +30,7 @@ OBJS=                         \
        promise_raid.o          \
        adaptec_raid.o          \
        jmicron_raid.o          \
+       ddf_raid.o              \
        iso9660.o               \
        jfs.o                   \
        linux_raid.o            \
@@ -69,7 +70,7 @@ all: libvolume_id.a $(SHLIB) libvolume_id.pc
 .shlib:
        $(Q) mkdir .shlib
 
-.shlib/%.o: %.c
+.shlib/%.o: %.c .shlib
        $(E) "  CC      " $@
        $(Q) $(CC) -c $(CFLAGS) -fPIC $< -o $@
 
@@ -102,8 +103,8 @@ 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)
+       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