ekiga r7416 - in trunk: lib/gui src/gui

[jpuydt svn gnome org]

Author: jpuydt
Date: Mon Nov 24 20:22:45 2008
New Revision: 7416
URL: http://svn.gnome.org/viewvc/ekiga?rev=7416&view=rev

Log:
Made out-of-tree builds work

Modified:
   trunk/lib/gui/Makefile.am
   trunk/src/gui/main.h

Modified: trunk/lib/gui/Makefile.am
==============================================================================
--- trunk/lib/gui/Makefile.am	(original)
+++ trunk/lib/gui/Makefile.am	Mon Nov 24 20:22:45 2008
@@ -2,67 +2,69 @@
 
 noinst_LTLIBRARIES = libgmwidgets.la
 
-libgmwidgets_la_SOURCES =	\
-	gm-smileys.h		\
-	gm-smileys.c		\
-	gmwindow.c		\
-	gmwindow.h		\
-	gmconfwidgets.c		\
-	gmconfwidgets.h		\
-	codecsbox.cpp		\
-	codecsbox.h		\
-	gmconnectbutton.c	\
-	gmconnectbutton.h	\
-	gmdialog.c		\
-	gmdialog.h		\
-	gmentrydialog.c		\
-	gmentrydialog.h		\
-	gmlevelmeter.c		\
-	gmlevelmeter.h		\
-	gmmenuaddon.c		\
-	gmmenuaddon.h		\
-	gmpreferences.c		\
-	gmpreferences.h		\
-	gmstatusbar.c		\
-	gmstatusbar.h		\
-	gmstockicons.c		\
-	gmstockicons.h		\
-	gmpowermeter.c		\
-	gmpowermeter.h		\
-	gmcellrendererexpander.c  \
-	gmcellrendererexpander.h  \
-	gm-cell-renderer-bitext.c \
-	gm-cell-renderer-bitext.h \
-	gm-text-buffer-enhancer-helper-iface.c \
-	gm-text-buffer-enhancer-helper-iface.h \
-	gm-text-anchored-tag.c \
-	gm-text-anchored-tag.h \
-	gm-text-smiley.c \
-	gm-text-smiley.h \
-	gm-text-extlink.c \
-	gm-text-extlink.h \
-	gm-text-buffer-enhancer.c \
-	gm-text-buffer-enhancer.h \
-	gm-smiley-chooser-button.c \
-	gm-smiley-chooser-button.h
+gui_dir = $(top_srcdir)/lib/gui
+
+libgmwidgets_la_SOURCES =		\
+	$(gui_dir)/gm-smileys.h		\
+	$(gui_dir)/gm-smileys.c		\
+	$(gui_dir)/gmwindow.c		\
+	$(gui_dir)/gmwindow.h		\
+	$(gui_dir)/gmconfwidgets.c	\
+	$(gui_dir)/gmconfwidgets.h	\
+	$(gui_dir)/codecsbox.cpp	\
+	$(gui_dir)/codecsbox.h		\
+	$(gui_dir)/gmconnectbutton.c	\
+	$(gui_dir)/gmconnectbutton.h	\
+	$(gui_dir)/gmdialog.c		\
+	$(gui_dir)/gmdialog.h		\
+	$(gui_dir)/gmentrydialog.c	\
+	$(gui_dir)/gmentrydialog.h	\
+	$(gui_dir)/gmlevelmeter.c	\
+	$(gui_dir)/gmlevelmeter.h	\
+	$(gui_dir)/gmmenuaddon.c	\
+	$(gui_dir)/gmmenuaddon.h	\
+	$(gui_dir)/gmpreferences.c	\
+	$(gui_dir)/gmpreferences.h	\
+	$(gui_dir)/gmstatusbar.c	\
+	$(gui_dir)/gmstatusbar.h	\
+	$(gui_dir)/gmstockicons.c	\
+	$(gui_dir)/gmstockicons.h	\
+	$(gui_dir)/gmpowermeter.c	\
+	$(gui_dir)/gmpowermeter.h	\
+	$(gui_dir)/gmcellrendererexpander.c  \
+	$(gui_dir)/gmcellrendererexpander.h  \
+	$(gui_dir)/gm-cell-renderer-bitext.c \
+	$(gui_dir)/gm-cell-renderer-bitext.h \
+	$(gui_dir)/gm-text-buffer-enhancer-helper-iface.c \
+	$(gui_dir)/gm-text-buffer-enhancer-helper-iface.h \
+	$(gui_dir)/gm-text-anchored-tag.c \
+	$(gui_dir)/gm-text-anchored-tag.h \
+	$(gui_dir)/gm-text-smiley.c \
+	$(gui_dir)/gm-text-smiley.h \
+	$(gui_dir)/gm-text-extlink.c \
+	$(gui_dir)/gm-text-extlink.h \
+	$(gui_dir)/gm-text-buffer-enhancer.c \
+	$(gui_dir)/gm-text-buffer-enhancer.h \
+	$(gui_dir)/gm-smiley-chooser-button.c \
+	$(gui_dir)/gm-smiley-chooser-button.h
 
 
 if !WIN32
 libgmwidgets_la_SOURCES +=	\
-	xwindow.cpp		\
-	xwindow.h
+	$(gui_dir)/xwindow.cpp		\
+	$(gui_dir)/xwindow.h
 endif
 
 if HAVE_XV
 libgmwidgets_la_SOURCES +=	\
-	xvwindow.cpp		\
-	xvwindow.h
+	$(gui_dir)/xvwindow.cpp		\
+	$(gui_dir)/xvwindow.h
 endif
 
 if HAVE_DX
 libgmwidgets_la_SOURCES +=	\
-	dxwindow.cpp		\
-	dxwindow.h
+	$(gui_dir)/dxwindow.cpp		\
+	$(gui_dir)/dxwindow.h
 endif
 
 INCLUDES =						\
@@ -74,8 +76,7 @@
 	-I$(top_builddir)
 
 if !WIN32
-INCLUDES +=						\
-	-I$(top_srcdir)/lib/pixops
+INCLUDES += -I$(top_srcdir)/lib/pixops
 endif
 
 AM_CFLAGS = $(GTK_CFLAGS) $(GLIB_CFLAGS) $(GNOME_CFLAGS)

Modified: trunk/src/gui/main.h
==============================================================================
--- trunk/src/gui/main.h	(original)
+++ trunk/src/gui/main.h	Mon Nov 24 20:22:45 2008
@@ -42,7 +42,7 @@
 #include "services.h"
 #include "call.h"
 
-#include "lib/gui/gmwindow.h"
+#include "gmwindow.h"
 
 G_BEGIN_DECLS