diff -ur --exclude Makefile yate.orig/Makefile.in yate/Makefile.in
--- yate.orig/Makefile.in	2009-02-06 14:54:30.453027648 +0100
+++ yate/Makefile.in	2009-02-06 15:11:13.733004572 +0100
@@ -12,8 +12,8 @@
 DEFS :=
 LIBTHR:= -lpthread
 INCLUDES := -I. -I@srcdir@
-CFLAGS := -O2 @MODULE_CPPFLAGS@ @INLINE_FLAGS@
-LDFLAGS:=
+CXXFLAGS += @MODULE_CPPFLAGS@ @INLINE_FLAGS@
+LDFLAGS+=
 LDCONFIG:=true
 
 MKDEPS := ./config.status
@@ -28,7 +28,7 @@
 OBJS := main.o
 
 CLEANS = $(PROGS) $(SLIBS) $(LIBS) $(OBJS) yatepaths.h core
-COMPILE = $(CXX) $(DEFS) $(DEBUG) $(INCLUDES) $(CFLAGS)
+COMPILE = $(CXX) $(DEFS) $(DEBUG) $(INCLUDES) $(CXXFLAGS)
 LINK = $(CXX) $(LDFLAGS)
 
 DOCGEN_F := $(INCS)
@@ -296,7 +296,7 @@
 Makefile: @srcdir@/Makefile.in $(MKDEPS)
 	./config.status
 
-yate: libyate.so $(OBJS) $(LIBS)
+yate: $(OBJS) libyate.so $(LIBS)
 	$(LINK) -o $@ $(LIBTHR) $^
 
 libyate.so: $(YLIB)
diff -ur --exclude Makefile yate.orig/clients/Makefile.in yate/clients/Makefile.in
--- yate.orig/clients/Makefile.in	2009-02-06 14:54:30.453027648 +0100
+++ yate/clients/Makefile.in	2009-02-06 15:17:45.373010989 +0100
@@ -12,8 +12,8 @@
 DEFS :=
 LIBTHR:= -lpthread
 INCLUDES := -I.. -I@top_srcdir@
-CFLAGS := -O2 @MODULE_CPPFLAGS@ @INLINE_FLAGS@
-LDFLAGS:= -L.. -lyate
+CXXFLAGS += @MODULE_CPPFLAGS@ @INLINE_FLAGS@
+LDFLAGS+= -L..
 INCFILES := @top_srcdir@/yatengine.h @top_srcdir@/yatephone.h ../yateversn.h
 
 SUBDIRS :=
@@ -32,8 +32,8 @@
 endif
 
 LOCALFLAGS =
-LOCALLIBS =
-COMPILE = $(CXX) $(DEFS) $(DEBUG) $(INCLUDES) $(CFLAGS)
+LOCALLIBS = -lyate
+COMPILE = $(CXX) $(DEFS) $(DEBUG) $(INCLUDES) $(CXXFLAGS)
 LINK = $(CXX) $(LDFLAGS)
 
 prefix = @prefix@
@@ -116,7 +116,7 @@
 yate-gtk2: $(GTKCLIENT)
 yate-gtk2: LDFLAGS := $(GTKCLIENT) $(LDFLAGS)
 yate-gtk2: LOCALFLAGS = @GTK2_INC@
-yate-gtk2: LOCALLIBS = @GTK2_LIB@
+yate-gtk2: LOCALLIBS += @GTK2_LIB@
 
 $(GTKCLIENT):
 	$(MAKE) -C ../contrib/gtk2
Only in yate: config.log
Only in yate: config.status
diff -ur --exclude Makefile yate.orig/contrib/gtk2/Makefile.in yate/contrib/gtk2/Makefile.in
--- yate.orig/contrib/gtk2/Makefile.in	2009-02-06 14:54:30.457004060 +0100
+++ yate/contrib/gtk2/Makefile.in	2009-02-06 15:17:15.993003394 +0100
@@ -5,15 +5,16 @@
 DEBUG :=
 
 CXX := @CXX@ -Wall
-AR  := ar
+#AR  := ar
 DEFS:=
 
 INCLUDES:=-I. -I@srcdir@ -I@top_srcdir@ @GTK2_INC@
-CXXFLAGS:=$(CXXFLAGS) @MODULE_CPPFLAGS@ @INLINE_FLAGS@
-LDFLAGS:= -L../.. -lyate
+CXXFLAGS+= @MODULE_CPPFLAGS@ @INLINE_FLAGS@
 INCFILES := @top_srcdir@/yateclass.h @top_srcdir@/yatecbase.h @srcdir@/gtk2client.h
 
+ifeq (@HAVE_GTK2@,yes)
 PROJECT = libgtk2client.a
+endif
 SOURCES = gtk2client.cpp
 OBJECTS = $(SOURCES:.cpp=.o)
 
Only in yate/contrib/gtk2: Makefile.in.orig
diff -ur --exclude Makefile yate.orig/contrib/ilbc/Makefile.in yate/contrib/ilbc/Makefile.in
--- yate.orig/contrib/ilbc/Makefile.in	2009-02-06 14:54:30.457004060 +0100
+++ yate/contrib/ilbc/Makefile.in	2009-02-06 15:08:35.465004588 +0100
@@ -2,12 +2,12 @@
 # This file holds the make rules for the libilbc 
 
 CC  := @CC@ -Wall
-AR  := ar
+#AR  := ar
 SED := sed
 DEFS :=
 INCLUDES := -I@top_srcdir@
-CFLAGS := -O3 -funroll-loops -fomit-frame-pointer -fsigned-char @MODULE_CFLAGS@
-LDFLAGS:=
+CFLAGS += -fsigned-char @MODULE_CFLAGS@
+LDFLAGS+=
 
 PROGS=
 LIBS = libilbc.a
diff -ur --exclude Makefile yate.orig/contrib/yiax/Makefile.in yate/contrib/yiax/Makefile.in
--- yate.orig/contrib/yiax/Makefile.in	2009-02-06 14:54:30.461003242 +0100
+++ yate/contrib/yiax/Makefile.in	2009-02-06 15:12:43.888003886 +0100
@@ -7,7 +7,7 @@
 AR  := ar
 DEFS :=
 INCLUDES := -I@top_srcdir@ -I../.. -I@srcdir@
-CFLAGS := -O2 @MODULE_CPPFLAGS@ @INLINE_FLAGS@
+CXFLAGS += @MODULE_CPPFLAGS@ @INLINE_FLAGS@
 LDFLAGS:= -L../.. -lyate
 INCFILES := @top_srcdir@/yateclass.h @srcdir@/yateiax.h
 
@@ -17,7 +17,7 @@
 
 LOCALFLAGS =
 LOCALLIBS =
-COMPILE = $(CXX) $(DEFS) $(DEBUG) $(INCLUDES) $(CFLAGS)
+COMPILE = $(CXX) $(DEFS) $(DEBUG) $(INCLUDES) $(CXXFLAGS)
 LINK = $(CC) $(LDFLAGS)
 
 prefix = @prefix@
diff -ur --exclude Makefile yate.orig/contrib/yjingle/Makefile.in yate/contrib/yjingle/Makefile.in
--- yate.orig/contrib/yjingle/Makefile.in	2009-02-06 14:54:30.465003959 +0100
+++ yate/contrib/yjingle/Makefile.in	2009-02-06 15:13:39.797003144 +0100
@@ -7,7 +7,7 @@
 AR  := ar
 DEFS :=
 INCLUDES := -I@top_srcdir@ -I../.. -I@srcdir@/../yxml -I@srcdir@
-CFLAGS := -O2 @MODULE_CPPFLAGS@ @INLINE_FLAGS@
+CXXFLAGS += @MODULE_CPPFLAGS@ @INLINE_FLAGS@
 LDFLAGS:= -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
 
@@ -17,7 +17,7 @@
 
 LOCALFLAGS =
 LOCALLIBS =
-COMPILE = $(CXX) $(DEFS) $(DEBUG) $(INCLUDES) $(CFLAGS)
+COMPILE = $(CXX) $(DEFS) $(DEBUG) $(INCLUDES) $(CXXFLAGS)
 LINK = $(CC) $(LDFLAGS)
 
 prefix = @prefix@
diff -ur --exclude Makefile yate.orig/contrib/ypbx/Makefile.in yate/contrib/ypbx/Makefile.in
--- yate.orig/contrib/ypbx/Makefile.in	2009-02-06 14:54:30.461003242 +0100
+++ yate/contrib/ypbx/Makefile.in	2009-02-06 15:11:39.676003888 +0100
@@ -7,7 +7,7 @@
 AR  := ar
 DEFS :=
 INCLUDES := -I@top_srcdir@ -I../.. -I@srcdir@
-CFLAGS := -O2 @MODULE_CPPFLAGS@ @INLINE_FLAGS@
+CXXFLAGS += @MODULE_CPPFLAGS@ @INLINE_FLAGS@
 LDFLAGS:= -L../.. -lyate
 INCFILES := @top_srcdir@/yateclass.h @srcdir@/yatepbx.h
 
@@ -17,7 +17,7 @@
 
 LOCALFLAGS =
 LOCALLIBS =
-COMPILE = $(CXX) $(DEFS) $(DEBUG) $(INCLUDES) $(CFLAGS)
+COMPILE = $(CXX) $(DEFS) $(DEBUG) $(INCLUDES) $(CXXFLAGS)
 LINK = $(CC) $(LDFLAGS)
 
 prefix = @prefix@
diff -ur --exclude Makefile yate.orig/contrib/yrtp/Makefile.in yate/contrib/yrtp/Makefile.in
--- yate.orig/contrib/yrtp/Makefile.in	2009-02-06 14:54:30.461003242 +0100
+++ yate/contrib/yrtp/Makefile.in	2009-02-06 15:12:06.480028423 +0100
@@ -7,7 +7,7 @@
 AR  := ar
 DEFS :=
 INCLUDES := -I@top_srcdir@ -I../.. -I@srcdir@
-CFLAGS := -O2 @MODULE_CPPFLAGS@ @INLINE_FLAGS@
+CXXFLAGS += @MODULE_CPPFLAGS@ @INLINE_FLAGS@
 LDFLAGS:= -L../.. -lyate
 INCFILES := @top_srcdir@/yateclass.h @srcdir@/yatertp.h
 
@@ -17,7 +17,7 @@
 
 LOCALFLAGS =
 LOCALLIBS =
-COMPILE = $(CXX) $(DEFS) $(DEBUG) $(INCLUDES) $(CFLAGS)
+COMPILE = $(CXX) $(DEFS) $(DEBUG) $(INCLUDES) $(CXXFLAGS)
 LINK = $(CC) $(LDFLAGS)
 
 prefix = @prefix@
diff -ur --exclude Makefile yate.orig/contrib/ysip/Makefile.in yate/contrib/ysip/Makefile.in
--- yate.orig/contrib/ysip/Makefile.in	2009-02-06 14:54:30.465003959 +0100
+++ yate/contrib/ysip/Makefile.in	2009-02-06 15:12:25.424027736 +0100
@@ -7,7 +7,7 @@
 AR  := ar
 DEFS :=
 INCLUDES := -I@top_srcdir@ -I../.. -I@srcdir@
-CFLAGS := -O2 @MODULE_CPPFLAGS@ @INLINE_FLAGS@
+CXXFLAGS += @MODULE_CPPFLAGS@ @INLINE_FLAGS@
 LDFLAGS:= -L../.. -lyate
 INCFILES := @top_srcdir@/yateclass.h @srcdir@/yatesip.h @srcdir@/util.h
 
@@ -17,7 +17,7 @@
 
 LOCALFLAGS =
 LOCALLIBS =
-COMPILE = $(CXX) $(DEFS) $(DEBUG) $(INCLUDES) $(CFLAGS)
+COMPILE = $(CXX) $(DEFS) $(DEBUG) $(INCLUDES) $(CXXFLAGS)
 LINK = $(CC) $(LDFLAGS)
 
 prefix = @prefix@
diff -ur --exclude Makefile yate.orig/contrib/yss7/Makefile.in yate/contrib/yss7/Makefile.in
--- yate.orig/contrib/yss7/Makefile.in	2009-02-06 14:54:30.465003959 +0100
+++ yate/contrib/yss7/Makefile.in	2009-02-06 15:08:18.680029330 +0100
@@ -8,8 +8,7 @@
 DEFS :=
 LIBTHR := -lpthread
 INCLUDES := -I@top_srcdir@ -I../.. -I@srcdir@
-CFLAGS := -O2 @MODULE_CPPFLAGS@ @INLINE_FLAGS@
-LDFLAGS:= -L../.. -lyate
+CFLAGS += @MODULE_CPPFLAGS@ @INLINE_FLAGS@
 INCFILES := @top_srcdir@/yateclass.h @srcdir@/yatess7.h
 
 PROGS= yate-ss7test
diff -ur --exclude Makefile yate.orig/contrib/yxml/Makefile.in yate/contrib/yxml/Makefile.in
--- yate.orig/contrib/yxml/Makefile.in	2009-02-06 14:54:30.465003959 +0100
+++ yate/contrib/yxml/Makefile.in	2009-02-06 15:13:05.144006036 +0100
@@ -7,7 +7,7 @@
 AR  := ar
 DEFS :=
 INCLUDES := -I@top_srcdir@ -I../.. -I@srcdir@
-CFLAGS := -O2 @MODULE_CPPFLAGS@ @INLINE_FLAGS@
+CXXFLAGS += @MODULE_CPPFLAGS@ @INLINE_FLAGS@
 LDFLAGS:= -L../.. -lyate
 INCFILES := @top_srcdir@/yateclass.h @srcdir@/tinystr.h @srcdir@/tinyxml.h
 
@@ -17,7 +17,7 @@
 
 LOCALFLAGS =
 LOCALLIBS =
-COMPILE = $(CXX) $(DEFS) $(DEBUG) $(INCLUDES) $(CFLAGS)
+COMPILE = $(CXX) $(DEFS) $(DEBUG) $(INCLUDES) $(CXXFLAGS)
 LINK = $(CC) $(LDFLAGS)
 
 prefix = @prefix@
diff -ur --exclude Makefile yate.orig/engine/Makefile.in yate/engine/Makefile.in
--- yate.orig/engine/Makefile.in	2009-02-06 14:54:30.485003426 +0100
+++ yate/engine/Makefile.in	2009-02-06 15:09:27.872003878 +0100
@@ -11,9 +11,9 @@
 LIBAUX:= @DLOPEN_LIB@
 LIBTHR:= -lpthread
 INCLUDES := -I.. -I@top_srcdir@
-CFLAGS := -O2 @MODULE_CFLAGS@ @INLINE_FLAGS@
-CPPFLAGS := -O2 @MODULE_CPPFLAGS@ @INLINE_FLAGS@
-LDFLAGS:=
+CFLAGS += @MODULE_CFLAGS@ @INLINE_FLAGS@
+CXXFLAGS += @MODULE_CPPFLAGS@ @INLINE_FLAGS@
+LDFLAGS+=
 LDCONFIG:=true
 
 MKDEPS := ../config.status
@@ -32,7 +32,7 @@
 LIBOBJS := $(CLSOBJS) $(ENGOBJS) $(TELOBJS) $(CLIOBJS)
 CLEANS = $(LIBOBJS) core
 CCOMPILE = $(CC) $(DEFS) $(DEBUG) $(INCLUDES) $(CFLAGS)
-COMPILE = $(CXX) $(DEFS) $(DEBUG) $(INCLUDES) $(CPPFLAGS)
+COMPILE = $(CXX) $(DEFS) $(DEBUG) $(INCLUDES) $(CXXFLAGS)
 LINK = $(CXX) $(LDFLAGS)
 SCTPOPTS:=
 
@@ -118,4 +118,4 @@
 	cd .. && ./config.status
 
 ../$(YLIB): $(LIBOBJS) $(LIBS)
-	$(LINK) -shared -o $@ -Wl,--soname=$(YLIB) $(LIBTHR) $^ $(LIBAUX)
+	$(LINK) -shared -o $@ -Wl,--soname=$(YLIB) $^ $(LIBTHR) $(LIBAUX)
diff -ur --exclude Makefile yate.orig/modules/Makefile.in yate/modules/Makefile.in
--- yate.orig/modules/Makefile.in	2009-02-06 14:54:30.485003426 +0100
+++ yate/modules/Makefile.in	2009-02-06 15:15:58.909003551 +0100
@@ -12,9 +12,9 @@
 SED := sed
 DEFS :=
 INCLUDES := -I.. -I@top_srcdir@
-CFLAGS := -O2 @MODULE_CFLAGS@ @INLINE_FLAGS@
-CPPFLAGS := -O2 @MODULE_CPPFLAGS@ @INLINE_FLAGS@
-LDFLAGS:= -L.. -lyate
+CFLAGS += @MODULE_CFLAGS@ @INLINE_FLAGS@
+CXXFLAGS += @MODULE_CPPFLAGS@ @INLINE_FLAGS@
+LDFLAGS+= -L..
 MODFLAGS:= @MODULE_LDFLAGS@
 MODRELAX:= @MODULE_LDRELAX@
 MODSTRIP:= @MODULE_SYMBOLS@
@@ -94,9 +94,9 @@
 endif
 
 LOCALFLAGS =
-LOCALLIBS =
+LOCALLIBS = -lyate
 CCOMPILE = $(CC) $(DEFS) $(DEBUG) $(INCLUDES) $(CFLAGS)
-COMPILE = $(CXX) $(DEFS) $(DEBUG) $(INCLUDES) $(CPPFLAGS)
+COMPILE = $(CXX) $(DEFS) $(DEBUG) $(INCLUDES) $(CXXFLAGS)
 LINK = $(CXX) $(LDFLAGS)
 MODLINK = $(CXX) $(MODFLAGS) $(MODSTRIP) $(LDFLAGS)
 MODCOMP = $(COMPILE) $(MODFLAGS) $(MODSTRIP) $(LDFLAGS)
@@ -127,7 +127,7 @@
 
 .PHONY: clean
 clean: do-clean
-	@-$(RM) $(PROGS) $(LIBS) *.o core 2>/dev/null
+	@-$(RM) $(LIBS) $(PROGS) *.o core 2>/dev/null
 
 .PHONY: install
 install: all do-install
@@ -169,80 +169,80 @@
 	$(LINK) -shared -o $@ $^
 
 %.yate: @srcdir@/%.cpp $(MKDEPS) $(INCFILES)
-	$(MODCOMP) -o $@ $(LOCALFLAGS) $< $(LOCALLIBS)
+	$(MODCOMP) -o $@ $(LOCALFLAGS) $< $(LOCALLIBS) $(LIBS)
 
 
 # Take special care of the modules that depend on optional libs
 
 zapchan.yate: libypri.o
 zapchan.yate: LOCALFLAGS = @ZAP_FLAGS@
-zapchan.yate: LOCALLIBS = libypri.o -lpri
+zapchan.yate: LOCALLIBS += libypri.o -lpri
 
 wpchan.yate: libypri.o
 wpchan.yate: LOCALFLAGS = @WANPIPE_HWEC_INC@
-wpchan.yate: LOCALLIBS = libypri.o -lpri
+wpchan.yate: LOCALLIBS += libypri.o -lpri
 
 ysigchan.yate wpcard.yate zapcard.yate: ../libyatess7.so
 ysigchan.yate wpcard.yate zapcard.yate: LOCALFLAGS = -I../contrib/yss7
-ysigchan.yate wpcard.yate zapcard.yate: LOCALLIBS = -lyatess7
+ysigchan.yate wpcard.yate zapcard.yate: LOCALLIBS += -lyatess7
 
 h323chan.yate: LOCALFLAGS = -DPHAS_TEMPLATES -D_REENTRANT -DP_HAS_SEMAPHORES @H323_INC@
-h323chan.yate: LOCALLIBS = @H323_LIB@
+h323chan.yate: LOCALLIBS += @H323_LIB@
 
 pgsqldb.yate: LOCALFLAGS = @PGSQL_INC@
-pgsqldb.yate: LOCALLIBS = -lpq
+pgsqldb.yate: LOCALLIBS += -lpq
 
 mysqldb.yate: LOCALFLAGS = @MYSQL_INC@
-mysqldb.yate: LOCALLIBS = @MYSQL_LIB@
+mysqldb.yate: LOCALLIBS += @MYSQL_LIB@
 
-enumroute.yate: LOCALLIBS = -lresolv
+enumroute.yate: LOCALLIBS += -lresolv
 
-alsachan.yate: LOCALLIBS = -lasound
+alsachan.yate: LOCALLIBS += -lasound
 
 yiaxchan.yate: ../contrib/yiax/libyateiax.a
 yiaxchan.yate: LOCALFLAGS = -I@top_srcdir@/contrib/yiax
-yiaxchan.yate: LOCALLIBS = -L../contrib/yiax -lyateiax
+yiaxchan.yate: LOCALLIBS += -L../contrib/yiax -lyateiax
 
 yjinglechan.yate: ../contrib/yxml/libyatexml.a ../contrib/yjingle/libyatejingle.a
 yjinglechan.yate: LOCALFLAGS = -I@top_srcdir@/contrib/yxml -I@top_srcdir@/contrib/yjingle
-yjinglechan.yate: LOCALLIBS = -L../contrib/yjingle -L../contrib/yxml -lyatejingle -lyatexml
+yjinglechan.yate: LOCALLIBS += -L../contrib/yjingle -L../contrib/yxml -lyatejingle -lyatexml
 
 dbpbx.yate: ../contrib/ypbx/libyatepbx.a
 dbpbx.yate: LOCALFLAGS = -I@top_srcdir@/contrib/ypbx
-dbpbx.yate: LOCALLIBS = ../contrib/ypbx/libyatepbx.a
+dbpbx.yate: LOCALLIBS += ../contrib/ypbx/libyatepbx.a
 
 pbxassist.yate: ../contrib/ypbx/libyatepbx.a
 pbxassist.yate: LOCALFLAGS = -I@top_srcdir@/contrib/ypbx
-pbxassist.yate: LOCALLIBS = ../contrib/ypbx/libyatepbx.a
+pbxassist.yate: LOCALLIBS += ../contrib/ypbx/libyatepbx.a
 
 ilbccodec.yate: ../contrib/ilbc/libilbc.a
-ilbccodec.yate: LOCALLIBS = ../contrib/ilbc/libilbc.a
+ilbccodec.yate: LOCALLIBS += ../contrib/ilbc/libilbc.a
 ilbccodec.yate: LOCALFLAGS = @ILBC_INC@
 
-gsmcodec.yate: LOCALLIBS = -lgsm
+gsmcodec.yate: LOCALLIBS += -lgsm
 gsmcodec.yate: LOCALFLAGS = @GSM_INC@
 
-speexcodec.yate: LOCALLIBS = -lspeex
+speexcodec.yate: LOCALLIBS += -lspeex
 speexcodec.yate: LOCALFLAGS = @SPEEX_INC@
 
-faxchan.yate: LOCALLIBS = -lspandsp
+faxchan.yate: LOCALLIBS += -lspandsp
 faxchan.yate: LOCALFLAGS = @SPANDSP_INC@
 
 ysipchan.yate: ../contrib/ysip/libyatesip.a
 ysipchan.yate: LOCALFLAGS = -I@top_srcdir@/contrib/ysip
-ysipchan.yate: LOCALLIBS = ../contrib/ysip/libyatesip.a
+ysipchan.yate: LOCALLIBS += ../contrib/ysip/libyatesip.a
 
 yrtpchan.yate: ../contrib/yrtp/libyatertp.a
 yrtpchan.yate: LOCALFLAGS = -I@top_srcdir@/contrib/yrtp
-yrtpchan.yate: LOCALLIBS = ../contrib/yrtp/libyatertp.a
+yrtpchan.yate: LOCALLIBS += ../contrib/yrtp/libyatertp.a
 
 gtk2/gtk2mozilla.yate: @top_srcdir@/contrib/gtk2/gtk2client.h
 gtk2/gtk2mozilla.yate: LOCALFLAGS = @GTK2_INC@ @GMOZ_INC@ -I@top_srcdir@/contrib/gtk2
-gtk2/gtk2mozilla.yate: LOCALLIBS = @GMOZ_LIB@
+gtk2/gtk2mozilla.yate: LOCALLIBS += @GMOZ_LIB@
 gtk2/gtk2mozilla.yate: MODFLAGS = $(MODRELAX)
 
 rmanager.yate: LOCALFLAGS = $(COREDUMP_INC)
-rmanager.yate: LOCALLIBS = $(COREDUMP_LIB)
+rmanager.yate: LOCALLIBS += $(COREDUMP_LIB)
 
 ../libyatess7.so:
 	$(MAKE) -C ../contrib/yss7
Only in yate: run
diff -ur --exclude Makefile yate.orig/test/Makefile.in yate/test/Makefile.in
--- yate.orig/test/Makefile.in	2009-02-06 14:54:30.497003971 +0100
+++ yate/test/Makefile.in	2009-02-06 15:03:14.912003374 +0100
@@ -5,8 +5,8 @@
 SED := sed
 DEFS :=
 INCLUDES := -I@top_srcdir@
-CFLAGS := -O0 @MODULE_CPPFLAGS@ @INLINE_FLAGS@
-LDFLAGS:= -L.. -lyate
+CFLAGS += -O0 @MODULE_CPPFLAGS@ @INLINE_FLAGS@
+LDFLAGS+= -L..
 MODFLAGS:= @MODULE_LDFLAGS@
 MODSTRIP:= @MODULE_SYMBOLS@
 
@@ -16,7 +16,7 @@
 OBJS =
 
 LOCALFLAGS =
-LOCALLIBS =
+LOCALLIBS = -lyate
 COMPILE = $(CXX) $(DEFS) $(INCLUDES) $(CFLAGS)
 LINK = $(CXX) $(LDFLAGS)
 MODLINK = $(CXX) $(MODFLAGS) $(MODSTRIP) $(LDFLAGS)
Only in yate: yate-config
Only in yate: yate.pc
Only in yate: yateversn.h