X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=extras%2Fvolume_id%2Flib%2FMakefile;h=90cd63e745e498e953ce1471d41d954c62a12f8c;hb=e55a73abb07e6949ebbf17fa08a3ddeaddbbc41f;hp=6a12f0e67a7ffa655a87be453eb79cea84cc412f;hpb=83cc6ab4760817509f1ed1ee429669e563f82caf;p=elogind.git

diff --git a/extras/volume_id/lib/Makefile b/extras/volume_id/lib/Makefile
index 6a12f0e67..90cd63e74 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 = 66
 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
@@ -81,7 +82,9 @@ libvolume_id.a: $(HEADERS) $(OBJS)
 
 $(SHLIB): $(HEADERS) .shlib $(addprefix .shlib/,$(OBJS))
 	$(E) "  CC      " $@
-	$(Q) $(CC) -shared $(CFLAGS) -o $@ -Wl,-soname,libvolume_id.so.$(SHLIB_CUR) $(addprefix .shlib/,$(OBJS))
+	$(Q) $(CC) -shared $(CFLAGS) -o $@ \
+		-Wl,-soname,libvolume_id.so.$(SHLIB_CUR),--version-script,exported_symbols \
+		$(addprefix .shlib/,$(OBJS))
 	$(Q) ln -sf $@ libvolume_id.so.$(SHLIB_CUR)
 	$(Q) ln -sf $@ libvolume_id.so
 
@@ -101,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