X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=extras%2Fvolume_id%2Flib%2FMakefile;h=e93f8b5af5936878471168e1d7b1aa1575f331cf;hb=04cc3a81d02af4d131b9c92defd7538f22089774;hp=f69df5f5ca43f19f690353c24344dea3926441e9;hpb=92da64c700371126ee3bde79f983e0b3056d9442;p=elogind.git

diff --git a/extras/volume_id/lib/Makefile b/extras/volume_id/lib/Makefile
index f69df5f5c..e93f8b5af 100644
--- a/extras/volume_id/lib/Makefile
+++ b/extras/volume_id/lib/Makefile
@@ -13,7 +13,7 @@ INSTALL_DATA  = ${INSTALL} -m 644
 INSTALL_LIB = ${INSTALL} -m 755
 
 SHLIB_CUR = 0
-SHLIB_REV = 61
+SHLIB_REV = 70
 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
@@ -103,8 +104,8 @@ 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
+	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