Sophie

Sophie

distrib > Mandriva > 2010.2 > i586 > media > contrib-release-src > by-pkgid > e86cc514838f77e23c8fb20febcaf72f > files > 5

yate-2.2.0-2mdv2010.1.src.rpm

Index: modules/Makefile.in
===================================================================
--- modules/Makefile.in
+++ modules/Makefile.in	2010-03-23 10:52:18.000000000 +0100
@@ -15,7 +15,8 @@
 INCLUDES := -I.. -I@top_srcdir@
 CFLAGS := @CFLAGS@ @MODULE_CFLAGS@ @INLINE_FLAGS@
 CPPFLAGS := @CFLAGS@ @MODULE_CPPFLAGS@ @INLINE_FLAGS@
-LDFLAGS:= @LDFLAGS@ -L.. -lyate
+LDFLAGS:= @LDFLAGS@ 
+YATE_LIBS:= -L.. -lyate
 MODFLAGS:= @MODULE_LDFLAGS@
 MODRELAX:= @MODULE_LDRELAX@
 MODSTRIP:= @MODULE_SYMBOLS@
@@ -200,19 +201,19 @@
 	$(LINK) -shared -o $@ $^ @LIBS@
 
 server/%.yate: @srcdir@/server/%.cpp $(MKDEPS) $(INCFILES)
-	$(MODCOMP) -o $@ $(LOCALFLAGS) $< $(LOCALLIBS) @LIBS@
+	$(MODCOMP) -o $@ $(LOCALFLAGS) $< $(LOCALLIBS) $(YATE_LIBS) @LIBS@
 
 client/%.yate: @srcdir@/client/%.cpp $(MKDEPS) $(INCFILES)
-	$(MODCOMP) -o $@ $(LOCALFLAGS) $< $(LOCALLIBS) @LIBS@
+	$(MODCOMP) -o $@ $(LOCALFLAGS) $< $(LOCALLIBS) $(YATE_LIBS) @LIBS@
 
 qt4/%.yate: @srcdir@/qt4/%.cpp $(MKDEPS) $(INCFILES)
-	$(MODCOMP) -o $@ $(LOCALFLAGS) @QT4_INC@ -I@top_srcdir@/clients/qt4 $< $(LOCALLIBS) @QT4_LIB@ @LIBS@
+	$(MODCOMP) -o $@ $(LOCALFLAGS) @QT4_INC@ -I@top_srcdir@/clients/qt4 $< $(LOCALLIBS) $(YATE_LIBS) @QT4_LIB@ @LIBS@
 
 qt4/%.moc: @srcdir@/qt4/%.h $(MKDEPS) $(INCFILES)
 	mkdir -p qt4 && $(MOC) $(DEFS) $(INCLUDES) @QT4_INC@ -I@top_srcdir@/clients/qt4 -I@srcdir@/qt4 -o $@ $<
 
 %.yate: @srcdir@/%.cpp $(MKDEPS) $(INCFILES)
-	$(MODCOMP) -o $@ $(LOCALFLAGS) $< $(LOCALLIBS) @LIBS@
+	$(MODCOMP) -o $@ $(LOCALFLAGS) $< $(LOCALLIBS) $(YATE_LIBS) @LIBS@
 
 # Take special care of the modules that depend on optional libs
 
Index: engine/Makefile.in
===================================================================
--- engine/Makefile.in
+++ engine/Makefile.in	2010-03-23 11:01:02.000000000 +0100
@@ -115,4 +115,4 @@
 	cd .. && ./config.status
 
 ../$(YLIB): $(LIBOBJS) $(LIBS)
-	$(LINK) -shared -o $@ -Wl,--soname=$(YLIB) $(LIBTHR) $^ $(LIBAUX)
+	$(LINK) -shared -o $@ -Wl,--soname=$(YLIB) $^ $(LIBTHR) $(LIBAUX)
Index: Makefile.in
===================================================================
--- Makefile.in
+++ Makefile.in	2010-03-23 11:13:13.000000000 +0100
@@ -315,7 +315,7 @@
 Makefile: @srcdir@/Makefile.in $(MKDEPS)
 	./config.status
 
-yate: libyate.so $(OBJS) $(LIBS)
+yate: $(OBJS) $(LIBS) libyate.so
 	$(LINK) -o $@ $(LIBTHR) $^ @LIBS@
 
 libyate.so: $(YLIB)
Index: libs/yjingle/Makefile.in
===================================================================
--- libs/yjingle/Makefile.in
+++ libs/yjingle/Makefile.in	2010-03-23 11:24:18.000000000 +0100
@@ -8,7 +8,8 @@
 DEFS :=
 INCLUDES := -I@top_srcdir@ -I../.. -I@srcdir@/../yxml -I@srcdir@
 CFLAGS := @CFLAGS@ @MODULE_CPPFLAGS@ @INLINE_FLAGS@
-LDFLAGS:= @LDFLAGS@ -L../.. -lyate
+LDFLAGS:= @LDFLAGS@ 
+YATE_LIBS:= -L../.. -lyate
 INCFILES := @top_srcdir@/yateclass.h @srcdir@/../yxml/tinystr.h @srcdir@/../yxml/tinyxml.h @srcdir@/xmlparser.h @srcdir@/xmpputils.h @srcdir@/yatejabber.h @srcdir@/yatejingle.h
 
 PROGS=
@@ -57,7 +58,7 @@
 	cd ../.. && ./config.status
 
 ../../$(LIBD_VER): $(OBJS) $(YXML)
-	$(LINK) -shared -o $@ -Wl,--soname=$(LIBD_VER) $^ @LIBS@
+	$(LINK) -shared -o $@ -Wl,--soname=$(LIBD_VER) $^ $(YATE_LIBS) @LIBS@
 
 ../../$(LIBD_DEV): ../../$(LIBD_VER)
 	cd ../.. && ln -sf $(LIBD_VER) $(LIBD_DEV)
Index: Makefile.in
===================================================================
--- libs/ymgcp/Makefile.in
+++ libs/ymgcp/Makefile.in	2010-03-23 11:54:34.000000000 +0100
@@ -8,7 +8,8 @@
 DEFS :=
 INCLUDES := -I@top_srcdir@ -I../.. -I@srcdir@
 CFLAGS := @CFLAGS@ @MODULE_CPPFLAGS@ @INLINE_FLAGS@
-LDFLAGS:= @LDFLAGS@ -L../.. -lyate
+LDFLAGS:= @LDFLAGS@ 
+YATE_LIBS:= -L../.. -lyate
 INCFILES := @top_srcdir@/yateclass.h @srcdir@/yatemgcp.h
 
 PROGS=
@@ -56,7 +57,7 @@
 	cd ../.. && ./config.status
 
 ../../$(LIBD_VER): $(OBJS)
-	$(LINK) -shared -o $@ -Wl,--soname=$(LIBD_VER) $^ @LIBS@
+	$(LINK) -shared -o $@ -Wl,--soname=$(LIBD_VER) $^ $(YATE_LIBS) @LIBS@
 
 ../../$(LIBD_DEV): ../../$(LIBD_VER)
 	cd ../.. && ln -sf $(LIBD_VER) $(LIBD_DEV)
Index: libs/ysig/Makefile.in
===================================================================
--- libs/ysig/Makefile.in
+++ libs/ysig/Makefile.in	2010-03-23 12:13:51.000000000 +0100
@@ -9,7 +9,8 @@
 LIBTHR := @THREAD_LIB@
 INCLUDES := -I@top_srcdir@ -I../.. -I@srcdir@
 CFLAGS := @CFLAGS@ @MODULE_CPPFLAGS@ @INLINE_FLAGS@
-LDFLAGS:= @LDFLAGS@ -L../.. -lyate
+LDFLAGS:= @LDFLAGS@ 
+YATE_LIBS:= -L../.. -lyate
 INCFILES := @top_srcdir@/yateclass.h @srcdir@/yatesig.h
 
 PROGS= yate-ss7test
@@ -64,7 +65,7 @@
 	cd ../.. && ./config.status
 
 ../../$(LIBD_VER): $(OBJS)
-	$(LINK) -shared -o $@ -Wl,--soname=$(LIBD_VER) $^ @LIBS@
+	$(LINK) -shared -o $@ -Wl,--soname=$(LIBD_VER) $^ $(YATE_LIBS) @LIBS@
 
 ../../$(LIBD_DEV): ../../$(LIBD_VER)
 	cd ../.. && ln -sf $(LIBD_VER) $(LIBD_DEV)
@@ -71,7 +71,7 @@
 	cd ../.. && ln -sf $(LIBD_VER) $(LIBD_DEV)
 
 yate-%: @srcdir@/main-%.cpp $(MKDEPS) $(LIBS) ../../libyate.so $(INCFILES)
-	$(COMPILE) -o $@ $(LOCALFLAGS) $< $(LIBTHR) $(LDFLAGS) $(LOCALLIBS) @LIBS@
+	$(COMPILE) -o $@ $(LOCALFLAGS) $< $(LIBTHR) $(LDFLAGS) $(LOCALLIBS) $(YATE_LIBS) @LIBS@
 
 $(LIBS): $(OBJS)
 	$(AR) rcs $@ $^