[svn-commits] tzafrir: branch tzafrir/makefile r1462 - /team/tzafrir/makefile/Makefile

[svn-commits at lists.digium.com]

Author: tzafrir
Date: Sat Sep  9 17:07:38 2006
New Revision: 1462

URL: http://svn.digium.com/view/zaptel?rev=3D1462&view=3Drev
Log:
A stab at simpifying the handling of libtonezone.
Though perhaps the install part is overly-simple.

Modified:
    team/tzafrir/makefile/Makefile

Modified: team/tzafrir/makefile/Makefile
URL: http://svn.digium.com/view/zaptel/team/tzafrir/makefile/Makefile?rev=
=3D1462&r1=3D1461&r2=3D1462&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- team/tzafrir/makefile/Makefile (original)
+++ team/tzafrir/makefile/Makefile Sat Sep  9 17:07:38 2006
@@ -127,10 +127,11 @@
 =

 LTZ_A:=3Dlibtonezone.a
 LTZ_A_OBJS:=3Dzonedata.o tonezone.o
-LTZ_SO:=3Dlibtonezone.so
+LTZ_BASE_SO:=3Dlibtonezone.so
 LTZ_SO_OBJS:=3Dzonedata.lo tonezone.lo
 LTZ_SO_MAJOR_VER:=3D1
 LTZ_SO_MINOR_VER:=3D0
+LTZ_SO:=3D$(LTZ_BASE_SO).$(LTZ_SO_MAJOR_VER).$(LTZ_SO_MINOR_VER)
 =

 ifdef MENUSELECT_MODULES
 MOD_LIST:=3D$(MENUSELECT_MODULES)
@@ -272,7 +273,7 @@
 	ranlib $@
 =

 $(LTZ_SO): $(LTZ_SO_OBJS)
-	$(CC) -shared -Wl,-soname,$(LTZ_SO).$(LTZ_SO_MAJOR_VER).$(LTZ_SO_MINOR_VE=
R) -o $@ $^ -lm
+	$(CC) -shared -o $@ $^ -lm
 =

 ztcfg.c: ztcfg.h
 =

@@ -390,16 +391,9 @@
 	fi
 =

 install-libs: $(LTZ_SO) $(LTZ_A)
-	$(INSTALL) -D -m 755 $(LTZ_A) $(LIB_DIR)/$(LTZ_A)
-	$(INSTALL) -D -m 755 $(LTZ_SO) $(LIB_DIR)/$(LTZ_SO).$(LTZ_SO_MAJOR_VER).$=
(LTZ_SO_MINOR_VER)
-	if [ -z "$(INSTALL_PREFIX)" -a `id -u` =3D 0 ]; then \
-		/sbin/ldconfig || : ;\
-	fi
-	rm -f $(LIB_DIR)$(LTZ_SO)
-	$(LN) -sf $(LTZ_SO).$(LTZ_SO_MAJOR_VER).$(LTZ_SO_MINOR_VER) \
-		$(LIB_DIR)/$(LTZ_SO).$(LTZ_SO_MAJOR_VER)
-	$(LN) -sf $(LTZ_SO).$(LTZ_SO_MAJOR_VER).$(LTZ_SO_MINOR_VER) \
-		$(LIB_DIR)/$(LTZ_SO)
+	$(INSTALL) -d $(LIB_DIR)
+	$(INSTALL) -D -m 755 $(LTZ_A) $(LTZ_SO) $(LIB_DIR)/
+	/sbin/ldconfig -n $(LIB_DIR)
 	if [ -z "$(INSTALL_PREFIX)" && -x /usr/sbin/sestatus ] && (/usr/sbin/sest=
atus | grep "SELinux status:" | grep -q "enabled") ; then restorecon -v $(L=
IB_DIR)/$(LTZ_SO); fi
 =

 install-include: