[ddccontrol-cvs] SF.net SVN: ddccontrol: [748] trunk/ddccontrol

[<el_...@us...>]

Revision: 748
          http://ddccontrol.svn.sourceforge.net/ddccontrol/?rev=748&view=rev
Author:   el_cubano
Date:     2007-10-28 01:37:57 -0700 (Sun, 28 Oct 2007)

Log Message:
-----------
More fixes for vpath building

Modified Paths:
--------------
    trunk/ddccontrol/doc/Makefile.am
    trunk/ddccontrol/src/ddccontrol/Makefile.am
    trunk/ddccontrol/src/ddcpci/Makefile.am
    trunk/ddccontrol/src/gddccontrol/Makefile.am
    trunk/ddccontrol/src/gnome-ddcc-applet/Makefile.am
    trunk/ddccontrol/src/lib/Makefile.am

Modified: trunk/ddccontrol/doc/Makefile.am
===================================================================
--- trunk/ddccontrol/doc/Makefile.am	2007-10-28 07:47:25 UTC (rev 747)
+++ trunk/ddccontrol/doc/Makefile.am	2007-10-28 08:37:57 UTC (rev 748)
@@ -7,11 +7,11 @@
 EXTRA_DIST = main.xml gpl.xml install.xml about.xml report.xml supportedgc.xml supportedmonitors.xml thanks.xml techdocs.xml usage.xml style.xsl style-fo.xsl
 
 if BUILD_DOC
-html/*: main.xml *.xml style.xsl
+html/*: main.xml gpl.xml install.xml about.xml report.xml supportedgc.xml supportedmonitors.xml thanks.xml techdocs.xml usage.xml style.xsl
 	rm -rf html.old
 	true `mv -f html html.old`
 	mkdir html
-	cd html; $(XSLTPROC) $(XSLTPROC_FLAGS) ../$(XHTML_STYLESHEET) ../$<
+	$(XSLTPROC) $(XSLTPROC_FLAGS) -o html/ @top_srcdir@/doc/$(XHTML_STYLESHEET) $<
 	-@TIDY@ -q -raw -im html/*.html
 
 publish: all

Modified: trunk/ddccontrol/src/ddccontrol/Makefile.am
===================================================================
--- trunk/ddccontrol/src/ddccontrol/Makefile.am	2007-10-28 07:47:25 UTC (rev 747)
+++ trunk/ddccontrol/src/ddccontrol/Makefile.am	2007-10-28 08:37:57 UTC (rev 748)
@@ -1,5 +1,5 @@
 localedir = $(datadir)/locale
-INCLUDES = -I../lib -DLOCALEDIR=\"$(localedir)\"
+INCLUDES = -I@top_srcdir@/src/lib -DLOCALEDIR=\"$(localedir)\"
 
 LDADD = ../lib/libddccontrol.la
 

Modified: trunk/ddccontrol/src/ddcpci/Makefile.am
===================================================================
--- trunk/ddccontrol/src/ddcpci/Makefile.am	2007-10-28 07:47:25 UTC (rev 747)
+++ trunk/ddccontrol/src/ddcpci/Makefile.am	2007-10-28 08:37:57 UTC (rev 748)
@@ -1,4 +1,4 @@
-INCLUDES = -I../lib  -DLOCALEDIR=\"$(localedir)\"
+INCLUDES = -I@top_srcdir@/src -I@top_srcdir@/src/lib  -DLOCALEDIR=\"$(localedir)\"
 
 bin_PROGRAMS = ddcpci
 ddcpci_LDFLAGS = -Wl,-z,now

Modified: trunk/ddccontrol/src/gddccontrol/Makefile.am
===================================================================
--- trunk/ddccontrol/src/gddccontrol/Makefile.am	2007-10-28 07:47:25 UTC (rev 747)
+++ trunk/ddccontrol/src/gddccontrol/Makefile.am	2007-10-28 08:37:57 UTC (rev 748)
@@ -1,5 +1,5 @@
 localedir = $(datadir)/locale
-INCLUDES = -I../lib -I.. -DLOCALEDIR=\"$(localedir)\"
+INCLUDES = -I@top_srcdir@/src/lib -I@top_srcdir@/src -DLOCALEDIR=\"$(localedir)\"
 
 EXTRA_DIST = gddccontrol.desktop.in gddccontrol.png gddccontrol-bluecurve.png
 

Modified: trunk/ddccontrol/src/gnome-ddcc-applet/Makefile.am
===================================================================
--- trunk/ddccontrol/src/gnome-ddcc-applet/Makefile.am	2007-10-28 07:47:25 UTC (rev 747)
+++ trunk/ddccontrol/src/gnome-ddcc-applet/Makefile.am	2007-10-28 08:37:57 UTC (rev 748)
@@ -1,6 +1,6 @@
 
 localedir = $(datadir)/locale
-INCLUDES = -I../lib -I.. -DLOCALEDIR=\"$(localedir)\"
+INCLUDES = -I@top_srcdir@/src/lib -I@top_srcdir@/src -DLOCALEDIR=\"$(localedir)\"
 
 DDCC_LDADD = ../lib/libddccontrol.la
 

Modified: trunk/ddccontrol/src/lib/Makefile.am
===================================================================
--- trunk/ddccontrol/src/lib/Makefile.am	2007-10-28 07:47:25 UTC (rev 747)
+++ trunk/ddccontrol/src/lib/Makefile.am	2007-10-28 08:37:57 UTC (rev 748)
@@ -1,5 +1,5 @@
 localedir = $(datadir)/locale
-INCLUDES = -I.. -DLOCALEDIR=\"$(localedir)\"
+INCLUDES = -I@top_srcdir@/src -DLOCALEDIR=\"$(localedir)\"
 
 pkginclude_HEADERS = conf.h monitor_db.h ddcci.h ddcpci-ipc.h
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.