[Asterisk-cvs] zaptel Makefile,1.76,1.77

[kpfleming at lists.digium.com]

Update of /usr/cvsroot/zaptel
In directory mongoose.digium.com:/tmp/cvs-serv27163

Modified Files:
	Makefile 
Log Message:
clean up soname and version number handling for libtonezone.so


Index: Makefile
===================================================================
RCS file: /usr/cvsroot/zaptel/Makefile,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -d -r1.76 -r1.77
--- Makefile	21 May 2005 17:56:51 -0000	1.76
+++ Makefile	21 May 2005 18:37:15 -0000	1.77
@@ -92,7 +92,9 @@
 endif
 
 TZOBJS:=zonedata.lo tonezone.lo
-LIBTONEZONE:=libtonezone.so.1.0
+LIBTONEZONE_SO:=libtonezone.so
+LIBTONEZONE_SO_MAJOR_VER:=1
+LIBTONEZONE_SO_MINOR_VER:=0
 MODULES:=zaptel tor2 torisa wcusb wcfxo wctdm \
 	 ztdynamic ztd-eth wct1xxp wct4xxp wcte11xp pciradio \
          ztd-loc # ztdummy
@@ -114,7 +116,7 @@
 #PRIMARY=wcfxo
 PWD:=$(shell pwd)
 
-all: $(BUILDVER) $(LIBTONEZONE)
+all: $(BUILDVER) $(LIBTONEZONE_SO)
 
 linux24: $(MODULESO) $(BINS)
 
@@ -226,18 +228,18 @@
 libtonezone.a: $(TZOBJS)
 	ar rcs libtonezone.a $(TZOBJS)
 
-$(LIBTONEZONE): $(TZOBJS)
-	$(CC) -shared -Wl,-soname,$(LIBTONEZONE) -lm -o $@ $^
+$(LIBTONEZONE_SO): $(TZOBJS)
+	$(CC) -shared -Wl,-soname,$(LIBTONEZONE_SO).$(LIBTONEZONE_SO_MAJOR_VER) -lm -o $@ $^
 
 ztcfg.c: ztcfg.h
 
-ztcfg-shared: ztcfg.o $(LIBTONEZONE)
+ztcfg-shared: ztcfg.o $(LIBTONEZONE_SO)
 	$(CC) -o $@ $^ -lm
 
 ztcfg: ztcfg.o libtonezone.a
 	$(CC) -o $@ $^ -lm
 
-ztcfg-dude: ztcfg-dude.o mknotch.o complex.o $(LIBTONEZONE)
+ztcfg-dude: ztcfg-dude.o mknotch.o complex.o $(LIBTONEZONE_SO)
 	$(CC) -o $@ $^ -lm
 
 mknotch.o: mknotch.cc
@@ -252,7 +254,7 @@
 usbfxstest: usbfxstest.o 
 	$(CC) -o $@ $^ -lzap
 
-fxstest: fxstest.o $(LIBTONEZONE)
+fxstest: fxstest.o $(LIBTONEZONE_SO)
 	$(CC) -o $@ $^ -lm
 
 fxotune: fxotune.o
@@ -316,13 +318,14 @@
 		fi; \
 		rm -f $(INSTALL_PREFIX)/lib/modules/$(KVERS)/misc/wcfxs.o; \
 	fi
-	install -D -m 755 $(LIBTONEZONE) $(INSTALL_PREFIX)/usr/lib/$(LIBTONEZONE)
-	if [ -x /usr/sbin/sestatus ] && (/usr/sbin/sestatus | grep "SELinux status:" | grep -q "enabled") ; then restorecon -v $(INSTALL_PREFIX)/usr/lib/$(LIBTONEZONE); fi
+	install -D -m 755 $(LIBTONEZONE_SO) $(INSTALL_PREFIX)/usr/lib/$(LIBTONEZONE_SO).$(LIBTONEZONE_SO_MAJOR_VER).$(LIBTONEZONE_SO_MINOR_VER)
+	[ `id -u` = 0 ] && /sbin/ldconfig || :
+	rm -f $(INSTALL_PREFIX)/usr/lib/$(LIBTONEZONE_SO)
+	ln -sf $(LIBTONEZONE_SO).$(LIBTONEZONE_SO_MAJOR_VER) $(INSTALL_PREFIX)/usr/lib/$(LIBTONEZONE_SO)
+	if [ -x /usr/sbin/sestatus ] && (/usr/sbin/sestatus | grep "SELinux status:" | grep -q "enabled") ; then restorecon -v $(INSTALL_PREFIX)/usr/lib/$(LIBTONEZONE_SO); fi
 	install -D -m 644 zaptel.h $(INSTALL_PREFIX)/usr/include/linux/zaptel.h
 	install -D -m 644 torisa.h $(INSTALL_PREFIX)/usr/include/linux/torisa.h
 	install -D -m 644 tonezone.h $(INSTALL_PREFIX)/usr/include/tonezone.h
-	rm -f $(INSTALL_PREFIX)/usr/lib/libtonezone.so
-	rm -f $(INSTALL_PREFIX)/usr/lib/libtonezone.so.1
 	if [ -f $(MODCONF) ]; then mv -f $(MODCONF) $(MODCONF).bak ; fi
 	cat $(MODCONF).bak | grep -v "alias char-major-250" | \
 	grep -v "post-install torisa /sbin/ztcfg" | \
@@ -388,7 +391,7 @@
 	rm -f torisatool makefw tor2fw.h radfw.h
 	rm -f ${BINS}
 	rm -f *.o ztcfg tzdriver sethdlc sethdlc-new
-	rm -f $(TZOBJS) $(LIBTONEZONE) *.lo
+	rm -f $(TZOBJS) $(LIBTONEZONE_SO) *.lo
 	rm -f *.ko *.mod.c .*o.cmd
 	rm -rf .tmp_versions
 	rm -f gendigits tones.h