libepc r193 - in trunk: . libepc

[hasselmm svn gnome org]

Author: hasselmm
Date: Wed Jan 16 11:13:00 2008
New Revision: 193
URL: http://svn.gnome.org/viewvc/libepc?rev=193&view=rev

Log:
Support building with srcdir != builddir - as far as possible:
gtk-doc seems to be totaly broken regarding that topic.

* libepc/*.c: Prefix local includes with libepc/.
* Makefile.am: Use $(srcdir) where needed.


Modified:
   trunk/ChangeLog
   trunk/Makefile.am
   trunk/libepc/consumer.c
   trunk/libepc/contents.c
   trunk/libepc/dispatcher.c
   trunk/libepc/protocol.c
   trunk/libepc/publisher.c
   trunk/libepc/service-info.c
   trunk/libepc/service-monitor.c
   trunk/libepc/service-type.c
   trunk/libepc/shell.c
   trunk/libepc/tls.c

Modified: trunk/Makefile.am
==============================================================================
--- trunk/Makefile.am	(original)
+++ trunk/Makefile.am	Wed Jan 16 11:13:00 2008
@@ -58,32 +58,31 @@
 # ================
 
 libepc_headers = \
-	libepc/consumer.h \
-	libepc/contents.h \
-	libepc/dispatcher.h \
-	libepc/marshal.h \
-	libepc/protocol.h \
-	libepc/publisher.h \
-	libepc/service-info.h \
-	libepc/service-monitor.h \
-	libepc/service-type.h \
-	libepc/shell.h \
-	libepc/tls.h
+	$(srcdir)/libepc/consumer.h \
+	$(srcdir)/libepc/contents.h \
+	$(srcdir)/libepc/dispatcher.h \
+	$(srcdir)/libepc/protocol.h \
+	$(srcdir)/libepc/publisher.h \
+	$(srcdir)/libepc/service-info.h \
+	$(srcdir)/libepc/service-monitor.h \
+	$(srcdir)/libepc/service-type.h \
+	$(srcdir)/libepc/shell.h \
+	$(srcdir)/libepc/tls.h
 libepc_include_HEADERS = \
 	$(libepc_headers) \
 	libepc/enums.h \
 	libepc/marshal.h
 libepc_ui_include_HEADERS = \
-	libepc-ui/password-dialog.h \
-	libepc-ui/progress-window.h
+	$(srcdir)/libepc-ui/password-dialog.h \
+	$(srcdir)/libepc-ui/progress-window.h
 pkgconfig_DATA = \
 	libepc-1.0.pc \
 	libepc-ui-1.0.pc
 EXTRA_DIST = \
-	gtk-doc.make \
+	$(srcdir)/gtk-doc.make \
 	$(gtkdoc_srcdir)/libepc-1.0-docs.xml \
 	$(gtkdoc_srcdir)/libepc-1.0-sections.txt \
-	tests/test-runner.sh
+	$(srcdir)/tests/test-runner.sh
 
 BUILT_SOURCES = \
 	libepc/enums.c \
@@ -186,24 +185,24 @@
 # -- CUSTOM RULES --
 # ==================
 
-libepc/marshal.h: libepc/marshal.list
+libepc/marshal.h: $(srcdir)/libepc/marshal.list
 	{ echo '/* Generated by $(GLIB_GENMARSHAL) from $< */' && \
 	  $(GLIB_GENMARSHAL) $< --header --prefix=_epc_marshal; } > $@ || \
 	{ rm -f $@; false; }
-libepc/marshal.c: libepc/marshal.list
+libepc/marshal.c: $(srcdir)/libepc/marshal.list
 	{ echo '/* Generated by $(GLIB_GENMARSHAL) from $< */' && \
 	  echo '#include "marshal.h"' && \
 	  $(GLIB_GENMARSHAL) $< --body --prefix=_epc_marshal; } > $@ || \
 	{ rm -f $@; false; }
 
-libepc/enums.h.tmp: libepc/enums.h.in $(libepc_headers)
-	(cd $(srcdir) && $(GLIB_MKENUMS) --template $< $(libepc_headers)) > $@ || { rm -f $@; false; }
+libepc/enums.h.tmp: $(srcdir)/libepc/enums.h.in $(libepc_headers)
+	$(GLIB_MKENUMS) --template $< $(libepc_headers) > $@ || { rm -f $@; false; }
 libepc/enums.h.stamp: libepc/enums.h.tmp
 	cmp -s $< libepc/enums.h || cp $< libepc/enums.h; touch $@
 libepc/enums.h: libepc/enums.h.stamp
 
-libepc/enums.c.tmp: libepc/enums.c.in $(libepc_headers)
-	(cd $(srcdir) && $(GLIB_MKENUMS) --template $< $(libepc_headers)) > $@ || { rm -f $@; false; }
+libepc/enums.c.tmp: $(srcdir)/libepc/enums.c.in $(libepc_headers)
+	$(GLIB_MKENUMS) --template $< $(libepc_headers) > $@ || { rm -f $@; false; }
 libepc/enums.c.stamp: libepc/enums.c.tmp
 	cmp -s $< libepc/enums.c || cp $< libepc/enums.c; touch $@
 libepc/enums.c: libepc/enums.c.stamp
@@ -226,8 +225,6 @@
 	cd $(gtkdoc_builddir) && $(MAKE) $(AM_MAKEFLAGS) docs
 install-data-local:
 	cd $(gtkdoc_builddir) && $(MAKE) $(AM_MAKEFLAGS) install-data
-maintainer-clean-local:
-	cd $(gtkdoc_builddir) && $(MAKE) $(AM_MAKEFLAGS) maintainer-clean
 uninstall-local:
 	cd $(gtkdoc_builddir) && $(MAKE) $(AM_MAKEFLAGS) uninstall
 

Modified: trunk/libepc/consumer.c
==============================================================================
--- trunk/libepc/consumer.c	(original)
+++ trunk/libepc/consumer.c	Wed Jan 16 11:13:00 2008
@@ -19,12 +19,12 @@
  *      Mathias Hasselmann
  */
 
-#include "consumer.h"
+#include "libepc/consumer.h"
 
-#include "enums.h"
-#include "marshal.h"
-#include "service-monitor.h"
-#include "shell.h"
+#include "libepc/enums.h"
+#include "libepc/marshal.h"
+#include "libepc/service-monitor.h"
+#include "libepc/shell.h"
 
 #include <glib/gi18n-lib.h>
 #include <libsoup/soup.h>

Modified: trunk/libepc/contents.c
==============================================================================
--- trunk/libepc/contents.c	(original)
+++ trunk/libepc/contents.c	Wed Jan 16 11:13:00 2008
@@ -19,8 +19,8 @@
  *      Mathias Hasselmann
  */
 
-#include "contents.h"
-#include "shell.h"
+#include "libepc/contents.h"
+#include "libepc/shell.h"
 
 #include <string.h>
 #include <unistd.h>

Modified: trunk/libepc/dispatcher.c
==============================================================================
--- trunk/libepc/dispatcher.c	(original)
+++ trunk/libepc/dispatcher.c	Wed Jan 16 11:13:00 2008
@@ -19,12 +19,12 @@
  *      Mathias Hasselmann
  */
 
-#include "dispatcher.h"
+#include "libepc/dispatcher.h"
 
-#include "enums.h"
-#include "service-monitor.h"
-#include "service-type.h"
-#include "shell.h"
+#include "libepc/enums.h"
+#include "libepc/service-monitor.h"
+#include "libepc/service-type.h"
+#include "libepc/shell.h"
 
 #include <avahi-common/alternative.h>
 #include <avahi-common/error.h>

Modified: trunk/libepc/protocol.c
==============================================================================
--- trunk/libepc/protocol.c	(original)
+++ trunk/libepc/protocol.c	Wed Jan 16 11:13:00 2008
@@ -19,9 +19,9 @@
  *      Mathias Hasselmann
  */
 
-#include "protocol.h"
-#include "service-type.h"
-#include "enums.h"
+#include "libepc/protocol.h"
+#include "libepc/service-type.h"
+#include "libepc/enums.h"
 
 #include <glib-object.h>
 

Modified: trunk/libepc/publisher.c
==============================================================================
--- trunk/libepc/publisher.c	(original)
+++ trunk/libepc/publisher.c	Wed Jan 16 11:13:00 2008
@@ -19,11 +19,11 @@
  *      Mathias Hasselmann
  */
 
-#include "publisher.h"
-#include "dispatcher.h"
-#include "enums.h"
-#include "shell.h"
-#include "tls.h"
+#include "libepc/publisher.h"
+#include "libepc/dispatcher.h"
+#include "libepc/enums.h"
+#include "libepc/shell.h"
+#include "libepc/tls.h"
 
 #include <glibconfig.h>
 #include <glib/gi18n-lib.h>

Modified: trunk/libepc/service-info.c
==============================================================================
--- trunk/libepc/service-info.c	(original)
+++ trunk/libepc/service-info.c	Wed Jan 16 11:13:00 2008
@@ -19,7 +19,7 @@
  *      Mathias Hasselmann
  */
 
-#include "service-info.h"
+#include "libepc/service-info.h"
 
 #include <string.h>
 

Modified: trunk/libepc/service-monitor.c
==============================================================================
--- trunk/libepc/service-monitor.c	(original)
+++ trunk/libepc/service-monitor.c	Wed Jan 16 11:13:00 2008
@@ -19,11 +19,11 @@
  *      Mathias Hasselmann
  */
 
-#include "service-monitor.h"
+#include "libepc/service-monitor.h"
 
-#include "marshal.h"
-#include "service-type.h"
-#include "shell.h"
+#include "libepc/marshal.h"
+#include "libepc/service-type.h"
+#include "libepc/shell.h"
 
 #include <avahi-common/error.h>
 #include <net/if.h>

Modified: trunk/libepc/service-type.c
==============================================================================
--- trunk/libepc/service-type.c	(original)
+++ trunk/libepc/service-type.c	Wed Jan 16 11:13:00 2008
@@ -19,8 +19,8 @@
  *      Mathias Hasselmann
  */
 
-#include "service-type.h"
-#include "enums.h"
+#include "libepc/service-type.h"
+#include "libepc/enums.h"
 
 #include <string.h>
 

Modified: trunk/libepc/shell.c
==============================================================================
--- trunk/libepc/shell.c	(original)
+++ trunk/libepc/shell.c	Wed Jan 16 11:13:00 2008
@@ -18,7 +18,7 @@
  * Authors:
  *      Mathias Hasselmann
  */
-#include "shell.h"
+#include "libepc/shell.h"
 
 #include <avahi-common/error.h>
 #include <avahi-glib/glib-malloc.h>

Modified: trunk/libepc/tls.c
==============================================================================
--- trunk/libepc/tls.c	(original)
+++ trunk/libepc/tls.c	Wed Jan 16 11:13:00 2008
@@ -18,8 +18,8 @@
  * Authors:
  *      Mathias Hasselmann
  */
-#include "tls.h"
-#include "shell.h"
+#include "libepc/tls.h"
+#include "libepc/shell.h"
 
 #include <sys/types.h>
 #include <sys/stat.h>