X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;ds=sidebyside;f=extras%2Fvolume_id%2Flib%2FMakefile;h=5618b96a51f739de2d840fdd4def79d9352e2daf;hb=ee466b321e5f4bb9f587f65ed05c87a51bc6fef2;hp=4ead34a20a7980b0ce04fe29b004ee1805ad8583;hpb=172ee4205cfbcf451e00b4d82edc42c2df0eb925;p=elogind.git

diff --git a/extras/volume_id/lib/Makefile b/extras/volume_id/lib/Makefile
index 4ead34a20..5618b96a5 100644
--- 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 = 63
+SHLIB_REV = 77
 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,6 +45,7 @@ OBJS=				\
 	romfs.o			\
 	sysv.o			\
 	minix.o			\
+	gfs.o			\
 	luks.o			\
 	ocfs.o			\
 	vxfs.o			\
@@ -66,7 +69,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 $@
 
@@ -99,8 +102,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