[Asterisk-cvs] zaptel Makefile,1.41,1.42

citats at lists.digium.com citats at lists.digium.com
Sat Apr 10 13:46:10 CDT 2004


Update of /usr/cvsroot/zaptel
In directory mongoose.digium.com:/home/citats/cvs/zaptel

Modified Files:
	Makefile 
Log Message:
Switch to using a non-shared copy of libtonezone with ztcfg so systems that have a seperate filesystem for /usr can modprobe early on in the boot process (before /usr is mounted)


Index: Makefile
===================================================================
RCS file: /usr/cvsroot/zaptel/Makefile,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -d -r1.41 -r1.42
--- Makefile	9 Apr 2004 00:39:13 -0000	1.41
+++ Makefile	10 Apr 2004 17:47:30 -0000	1.42
@@ -174,6 +174,9 @@
 sethdlc-new.o: sethdlc-new.c
 	$(CC) -c $(CFLAGS) -I$(KINCLUDES) sethdlc-new.c
 
+libtonezone.a: $(TZOBJS)
+	ar rcs libtonezone.a $(TZOBJS)
+
 $(LIBTONEZONE): $(TZOBJS)
 	$(CC) -shared -Wl,-soname,libtonezone.so.1 -lm -o $@ $(TZOBJS)
 	/sbin/ldconfig -n .
@@ -181,8 +184,11 @@
 
 ztcfg.c: ztcfg.h
 
-ztcfg: ztcfg.o  $(LIBTONEZONE)
-	$(CC) -o ztcfg ztcfg.o -lm -L. -ltonezone
+ztcfg-shared: ztcfg.o $(LIBTONEZONE)
+	$(CC) -o ztcfg-shared ztcfg.o -lm -L. -ltonezone
+
+ztcfg: ztcfg.o libtonezone.a
+	$(CC) -o ztcfg ztcfg.o -lm -L. libtonezone.a
 
 ztcfg-dude: ztcfg-dude.o mknotch.o complex.o $(LIBTONEZONE)
 	$(CC) -o ztcfg ztcfg-dude.o mknotch.o complex.o -lm -L. -ltonezone
@@ -230,7 +236,7 @@
 	@echo "**** devfs detected -- not making device nodes"
 endif
 
-install:  all devices
+install:  all devices $(LIBTONEZONE)
 	mkdir -p $(INSTALL_PREFIX)/sbin
 	install -m 755 ztcfg $(INSTALL_PREFIX)/sbin
 	if [ -f sethdlc-new ]; then \




More information about the svn-commits mailing list