[presence] More build fixes.

[Fabian Deutsch]

commit cdc46b1653d88b2a798a0b83e26f01f017ecce90
Author: Fabian Deutsch <fabian.deutsch at gmx.de>
Date:   Wed May 2 20:00:25 2012 +0200

    More build fixes.
    
    Signed-off-by: Fabian Deutsch <fabian.deutsch at gmx.de>

 presence-build.patch |   63 +++++++++++++++++++++++++++++++++++++++++++++++--
 presence.spec        |    3 +-
 2 files changed, 61 insertions(+), 5 deletions(-)
---
diff --git a/presence-build.patch b/presence-build.patch
index ffef08d..d90911f 100644
--- a/presence-build.patch
+++ b/presence-build.patch
@@ -19,10 +19,10 @@ index b394797..147f454 100644
  
  AC_ARG_ENABLE(debug, AS_HELP_STRING([--enable-debug], [Enable debug messages]), enable_debug=$enableval, enable_debug=no)
 diff --git a/src/Makefile.am b/src/Makefile.am
-index 87ac6b7..260034a 100644
+index 87ac6b7..aa17026 100644
 --- a/src/Makefile.am
 +++ b/src/Makefile.am
-@@ -1,7 +1,7 @@
+@@ -1,14 +1,14 @@
  
 -includedir = $(top_builddir)/includes/
 +includedir = $(top_srcdir)/includes/
@@ -32,7 +32,15 @@ index 87ac6b7..260034a 100644
  
  #
  # Common
-@@ -18,8 +18,7 @@ AM_LDFLAGS = \
+ #
+ AM_CFLAGS = \
+   -O3 \
+-  -include config.h \
++  -include $(srcdir)/config.h \
+   -I $(includedir) \
+   $(BASE_CFLAGS)
+ 
+@@ -18,14 +18,13 @@ AM_LDFLAGS = \
  VALAFLAGS = \
    --thread \
    --vapidir=$(vapidir) \
@@ -42,3 +50,52 @@ index 87ac6b7..260034a 100644
  
  CLEANFILES = \
    $(includedir)/*.h \
+   $(noinst_LTLIBRARIES:.la=.vapi) \
+   $(SOURCES:.vala=.c) \
+-  *.vapi *.h *.c
++  $(srcdir)/*.vapi $(srcdir)/*.h $(srcdir)/*.c
+ 
+ if ENABLE_VERBOSE
+   VALAFLAGS += --verbose
+@@ -48,7 +47,6 @@ presence_SOURCES = \
+   library.vapi \
+   settings.vapi \
+   ui.vapi
+-
+ presence_VALAFLAGS = \
+   --pkg gstreamer-0.10 \
+   --pkg libnotify \
+@@ -64,7 +62,7 @@ libsettings_a_VALAFLAGS = --vapi settings.vapi -H settings.h
+ 
+ 
+ ui.vapi: libui.a
+-libui_a_SOURCES = mainWindow.vala dialogs.vala settings.c media.c
++libui_a_SOURCES = mainWindow.vala dialogs.vala settings.c media.c settings.vapi media.vapi
+ libui_a_CFLAGS = $(UI_CFLAGS) $(MEDIA_CFLAGS)
+ libui_a_VALAFLAGS = \
+   --vapi ui.vapi -H ui.h \
+@@ -74,21 +72,15 @@ libui_a_VALAFLAGS = \
+   --pkg mx-1.0 \
+   --pkg gtk+-3.0 \
+   --pkg gudev-1.0 \
+-  --pkg buildconfig \
+-  --pkg media \
+-  --pkg settings
+-
++  --pkg buildconfig
+ 
+ library.vapi: libpresence.a
+-libpresence_a_SOURCES = library.vala settings.c media.c mdns.c
++libpresence_a_SOURCES = library.vala settings.c media.c mdns.c media.vapi mdns.vapi settings.vapi
+ libpresence_a_CFLAGS = $(MEDIA_CFLAGS) $(MDNS_CFLAGS)
+ libpresence_a_LIBADD = libmedia.a libmdns.a
+ libpresence_a_VALAFLAGS = \
+   --vapi library.vapi -H library.h \
+-  --pkg gstreamer-0.10 \
+-  --pkg settings \
+-  --pkg media \
+-  --pkg mdns
++  --pkg gstreamer-0.10
+ 
+ media.vapi: libmedia.a
+ libmedia_a_SOURCES = media.vala
diff --git a/presence.spec b/presence.spec
index 4533c7a..53887f6 100644
--- a/presence.spec
+++ b/presence.spec
@@ -36,8 +36,7 @@ chmod a+x ./autogen.sh
 %build
 ./autogen.sh
 %configure
-make clean
-make -v %{?_smp_mflags}
+make V=1 %{?_smp_mflags}
 
 
 %install