[svn-commits] kpfleming: trunk r1319 - /trunk/Makefile

[svn-commits at lists.digium.com]

Author: kpfleming
Date: Wed Aug 16 15:01:27 2006
New Revision: 1319

URL: http://svn.digium.com/view/zaptel?rev=1319&view=rev
Log:
clean up libtonezone-related rules

Modified:
    trunk/Makefile

Modified: trunk/Makefile
URL: http://svn.digium.com/view/zaptel/trunk/Makefile?rev=1319&r1=1318&r2=1319&view=diff
==============================================================================
--- trunk/Makefile (original)
+++ trunk/Makefile Wed Aug 16 15:01:27 2006
@@ -125,11 +125,12 @@
   ZAPTELVERSION=SVN-$(shell build_tools/make_svn_branch_name)
 endif
 
-TZOBJS:=zonedata.lo tonezone.lo
-LIBTONEZONE_SO:=libtonezone.so
-LIBTONEZONE_SO_MAJOR_VER:=1
-LIBTONEZONE_SO_MINOR_VER:=0
-LIBTONEZONE_A:=libtonezone.a
+LTZ_A:=libtonezone.a
+LTZ_A_OBJS:=zonedata.o tonezone.o
+LTZ_SO:=libtonezone.so
+LTZ_SO_OBJS:=zonedata.lo tonezone.lo
+LTZ_SO_MAJOR_VER:=1
+LTZ_SO_MINOR_VER:=0
 
 ifeq ($(findstring xpp_usb,$(MENUSELECT_MODULES)),)
   BUILD_XPP:=yes
@@ -184,7 +185,7 @@
 all: menuselect.makeopts 
 	@$(MAKE) _all
 
-_all: $(if $(MODULES),modules) programs $(LIBTONEZONE_SO)
+_all: $(if $(MODULES),modules) programs $(LTZ_SO) $(LTZ_A)
 
 programs: $(BINS)
 
@@ -286,24 +287,24 @@
 zttool: LDLIBS+=$(NEWT_LIB)
 sethdlc-new.o: CFLAGS+=-I$(KINCLUDES)
 
-libtonezone.a: $(TZOBJS)
-	ar rcs libtonezone.a $^
-
-$(LIBTONEZONE_SO): $(TZOBJS)
-	$(CC) -shared -Wl,-soname,$(LIBTONEZONE_SO).$(LIBTONEZONE_SO_MAJOR_VER).$(LIBTONEZONE_SO_MINOR_VER) -o $@ $^ -lm
+$(LTZ_A): $(LTZ_A_OBJS)
+	ar rcs $@ $^
+
+$(LTZ_SO): $(LTZ_SO_OBJS)
+	$(CC) -shared -Wl,-soname,$(LTZ_SO).$(LTZ_SO_MAJOR_VER).$(LTZ_SO_MINOR_VER) -o $@ $^ -lm
 
 ztcfg.c: ztcfg.h
 
-ztcfg-shared: ztcfg.o $(LIBTONEZONE_SO)
+ztcfg-shared: ztcfg.o $(LTZ_SO)
 	$(CC) -o $@ $^ -lm
 
 data:
 	$(MAKE) -C datamods datamods
 
-ztcfg: ztcfg.o libtonezone.a
+ztcfg: ztcfg.o $(LTZ_A)
 	$(CC) -o $@ $^ -lm
 
-ztcfg-dude: ztcfg-dude.o mknotch.o complex.o $(LIBTONEZONE_SO)
+ztcfg-dude: ztcfg-dude.o mknotch.o complex.o $(LTZ_SO)
 	$(CC) -o $@ $^ -lm
 
 mknotch.o: mknotch.cc
@@ -313,7 +314,7 @@
 	$(CC) -o $@ -c $^
 
 usbfxstest: LDLIBS+=-lzap
-fxstest: $(LIBTONEZONE_SO)
+fxstest: $(LTZ_SO)
 fxstest: LDLIBS+=-lm
 fxotune: LDLIBS+=-lm
 fxsdump: LDLIBS+=-lm
@@ -407,18 +408,18 @@
 		/sbin/update-modules ; \
 	fi
 
-install-libs: $(LIBTONEZONE_SO) $(LIBTONEZONE_A)
-	$(INSTALL) -D -m 755 $(LIBTONEZONE_A) $(LIB_DIR)/$(LIBTONEZONE_A)
-	$(INSTALL) -D -m 755 $(LIBTONEZONE_SO) $(LIB_DIR)/$(LIBTONEZONE_SO).$(LIBTONEZONE_SO_MAJOR_VER).$(LIBTONEZONE_SO_MINOR_VER)
+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` = 0 ]; then \
 		/sbin/ldconfig || : ;\
 	fi
-	rm -f $(LIB_DIR)$(LIBTONEZONE_SO)
-	$(LN) -sf $(LIBTONEZONE_SO).$(LIBTONEZONE_SO_MAJOR_VER).$(LIBTONEZONE_SO_MINOR_VER) \
-		$(LIB_DIR)/$(LIBTONEZONE_SO).$(LIBTONEZONE_SO_MAJOR_VER)
-	$(LN) -sf $(LIBTONEZONE_SO).$(LIBTONEZONE_SO_MAJOR_VER).$(LIBTONEZONE_SO_MINOR_VER) \
-		$(LIB_DIR)/$(LIBTONEZONE_SO)
-	if [ -z "$(INSTALL_PREFIX)" && -x /usr/sbin/sestatus ] && (/usr/sbin/sestatus | grep "SELinux status:" | grep -q "enabled") ; then restorecon -v $(LIB_DIR)/$(LIBTONEZONE_SO); 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)
+	if [ -z "$(INSTALL_PREFIX)" && -x /usr/sbin/sestatus ] && (/usr/sbin/sestatus | grep "SELinux status:" | grep -q "enabled") ; then restorecon -v $(LIB_DIR)/$(LTZ_SO); fi
 
 install-include:
 	$(INSTALL) -D -m 644 zaptel.h $(INSTALL_PREFIX)/usr/include/zaptel/zaptel.h
@@ -497,7 +498,7 @@
 	rm -f torisatool makefw tor2fw.h radfw.h
 	rm -f $(BINS)
 	rm -f *.o ztcfg tzdriver sethdlc sethdlc-new
-	rm -f $(TZOBJS) $(LIBTONEZONE_SO) *.lo
+	rm -f $(LTZ_SO) $(LTZ_A) *.lo
 ifeq ($(BUILDVER),linux26)
 	$(KMAKE) clean
 	$(MAKE) -C datamods clean