Fix out-of-tree build error

Conflicts:

	src/gui/Makefile.am

src/gui/Makefile.am

@@ -2,7 +2,7 @@ SUBDIRS=test
 
 AM_CFLAGS=-I$(srcdir)/../libqq/\
       -I$(srcdir)/../comm/\
-      -I$(srcdir)/.\
+      -I$(srcdir)\
       $(GTK_CFLAGS)\
       $(SQLITE3_CFLAGS)\
 	  $(GSTREAMER_CFLAGS)\
@@ -14,7 +14,7 @@ AM_CFLAGS=-I$(srcdir)/../libqq/\
       -Wall -Werror
 
 bin_PROGRAMS=gtkqq
-gtkqq_LDADD = $(GTK_LIBS) $(GSTREAMER_LIBS) $(GSTINTERFACES_LIBS) ${srcdir}/../libqq/libwebqq.la $(SQLITE3_LIBS) $(LIBNOTIFY_LIBS)
+gtkqq_LDADD = $(GTK_LIBS) $(GSTREAMER_LIBS) $(GSTINTERFACES_LIBS) ../../libqq/libwebqq.la $(SQLITE3_LIBS) $(LIBNOTIFY_LIBS)
 gtkqq_SOURCES=main.c \
           msgloop.c msgloop.h\
           dao.c dao.h\
@@ -30,8 +30,8 @@ gtkqq_SOURCES=main.c \
           loginpanel.c loginpanel.h \
           mainpanel.h mainpanel.c\
           mainwindow.h mainwindow.c \
-          ${srcdir}/../comm/log.c\
-          ${srcdir}/../comm/cprint.c\
+          $(srcdir)/../comm/log.c\
+          $(srcdir)/../comm/cprint.c\
           splashpanel.h splashpanel.c\
           gqqconfig.h gqqconfig.c\
           statusbutton.h statusbutton.c\

src/test/Makefile.am

@@ -1,27 +1,27 @@
-AM_CFLAGS=-I${srcdir}/../libqq/ 
+AM_CFLAGS=-I${srcdir}/../libqq/
 AM_CFLAGS+=-I${srcdir}/../comm/
 AM_CFLAGS+=-I${srcdir}/../gui/
 AM_CFLAGS+=${GLIB_CFLAGS} -DGTKQQ_DEBUG -Wall -Werror
 
 noinst_PROGRAMS=testhttp testjson testcprint testlog testurl testpro testproxy
 
 testhttp_SOURCES= testhttp.c
-testhttp_LDADD=${srcdir}/../libqq/libwebqq.la $(GLIB_LIBS)
+testhttp_LDADD=../libqq/libwebqq.la $(GLIB_LIBS)
 
 testjson_SOURCES= testjson.c  ${srcdir}/../libqq/json.c ${srcdir}/../libqq/json.h
 testjson_LDADD=$(GLIB_LIBS)
 
-testcprint_SOURCES= ${srcdir}/../comm/cprint.c testcprint.c 
-testcprint_LDADD=${srcdir}/../libqq/libwebqq.la $(GLIB_LIBS)
+testcprint_SOURCES= ${srcdir}/../comm/cprint.c testcprint.c
+testcprint_LDADD=../libqq/libwebqq.la $(GLIB_LIBS)
 
 testlog_SOURCES= ${srcdir}/../comm/cprint.c ${srcdir}/../comm/log.c testlog.c
-testlog_LDADD=${srcdir}/../libqq/libwebqq.la $(GLIB_LIBS)
+testlog_LDADD=../libqq/libwebqq.la $(GLIB_LIBS)
 
-testurl_SOURCES= ${srcdir}/../comm/log.c testurl.c ${srcdir}/../comm/cprint.c 
-testurl_LDADD=${srcdir}/../libqq/libwebqq.la $(GLIB_LIBS)
+testurl_SOURCES= ${srcdir}/../comm/log.c testurl.c ${srcdir}/../comm/cprint.c
+testurl_LDADD=../libqq/libwebqq.la $(GLIB_LIBS)
 
 testpro_SOURCES= ${srcdir}/../comm/cprint.c testpro.c ${srcdir}/../comm/log.c
-testpro_LDADD=${srcdir}/../libqq/libwebqq.la $(GLIB_LIBS)
+testpro_LDADD=../libqq/libwebqq.la $(GLIB_LIBS)
 
 testproxy_SOURCES=testproxy.c
-testproxy_LDADD=${srcdir}/../libqq/libwebqq.la $(GLIB_LIBS)
+testproxy_LDADD=../libqq/libwebqq.la $(GLIB_LIBS)