[Xcb-commit] 2 commits - atom configure.ac property

[Jamey Sharp]

 atom/Makefile.am     |    5 +++--
 configure.ac         |   10 +++++-----
 property/Makefile.am |    4 ++--
 3 files changed, 10 insertions(+), 9 deletions(-)

New commits:
diff-tree cbbdf0f622ed3a8642e30198940e24117baaf55e (from f7135a3f88c045e0ab1db78cfa8344a704dd3614)
Author: Jamey Sharp <jamey at minilop.net>
Date:   Sun Nov 12 17:48:28 2006 -0800

    Clean up built sources. Makes `distcheck` pass.

diff --git a/atom/Makefile.am b/atom/Makefile.am
index db261a8..eaff571 100644
--- a/atom/Makefile.am
+++ b/atom/Makefile.am
@@ -16,6 +16,7 @@ pkgconfig_DATA = xcb-atom.pc
 EXTRA_DIST = xcb-atom.pc.in
 
 BUILT_SOURCES = atoms.c atoms.gperf xcb_atom.h
+CLEANFILES = $(BUILT_SOURCES)
 
 atoms.c: atoms.gperf
 	$(GPERF) --output-file $@ $<
diff-tree f7135a3f88c045e0ab1db78cfa8344a704dd3614 (from 44b2f6aac77b305e455edad90b4b9348ef6b06b8)
Author: Jamey Sharp <jamey at minilop.net>
Date:   Sun Nov 12 17:30:00 2006 -0800

    Bug #6781: make util compile with srcdir != builddir.

diff --git a/atom/Makefile.am b/atom/Makefile.am
index c0b3ecc..db261a8 100644
--- a/atom/Makefile.am
+++ b/atom/Makefile.am
@@ -21,7 +21,7 @@ atoms.c: atoms.gperf
 	$(GPERF) --output-file $@ $<
 
 atoms.gperf: atoms.gperf.m4 atomlist.m4
-	$(M4) $< >$@
+	$(M4) -I$(srcdir) $< >$@
 
 xcb_atom.h: xcb_atom.h.m4 atomlist.m4
-	$(M4) $< >$@
+	$(M4) -I$(srcdir) $< >$@
diff --git a/configure.ac b/configure.ac
index a112b39..8b3c4ba 100644
--- a/configure.ac
+++ b/configure.ac
@@ -21,15 +21,15 @@ PKG_CHECK_MODULES(XCB, xcb)
 PKG_CHECK_MODULES(XCB_SHM, xcb-shm)
 PKG_CHECK_MODULES(XCB_RENDER, xcb-render)
 
-XCB_AUX_CFLAGS='-I$(top_builddir)/convenient'
+XCB_AUX_CFLAGS='-I$(top_srcdir)/convenient'
 XCB_AUX_LIBS='$(top_builddir)/convenient/libXCBAux.la'
-XCB_ATOM_CFLAGS='-I$(top_builddir)/atom'
+XCB_ATOM_CFLAGS='-I$(top_srcdir)/atom -I$(top_builddir)/atom'
 XCB_ATOM_LIBS='$(top_builddir)/atom/libXCBAtom.la'
-XCB_EVENT_CFLAGS='-I$(top_builddir)/event'
+XCB_EVENT_CFLAGS='-I$(top_srcdir)/event'
 XCB_EVENT_LIBS='$(top_builddir)/event/libXCBEvent.la'
-XCB_PROPERTY_CFLAGS='-I$(top_builddir)/property'
+XCB_PROPERTY_CFLAGS='-I$(top_srcdir)/property'
 XCB_PROPERTY_LIBS='$(top_builddir)/property/libXCBProperty.la'
-XCB_ICCCM_CFLAGS='-I$(top_builddir)/icccm'
+XCB_ICCCM_CFLAGS='-I$(top_srcdir)/icccm'
 XCB_ICCCM_LIBS='$(top_builddir)/icccm/libXCBICCCM.la'
 AC_SUBST(XCB_AUX_CFLAGS)
 AC_SUBST(XCB_AUX_LIBS)
diff --git a/property/Makefile.am b/property/Makefile.am
index 9282a10..e96b4c0 100644
--- a/property/Makefile.am
+++ b/property/Makefile.am
@@ -8,8 +8,8 @@ xcbinclude_HEADERS = xcb_property.h
 AM_CFLAGS = -Wall
 
 libXCBProperty_la_SOURCES = prop.c
-libXCBProperty_la_CFLAGS = $(XCB_CFLAGS) -I../event
-libXCBProperty_la_LIBADD = $(XCB_LIBS) -L../event -lXCBEvent
+libXCBProperty_la_CFLAGS = $(XCB_CFLAGS) $(XCB_EVENT_CFLAGS)
+libXCBProperty_la_LIBADD = $(XCB_LIBS) $(XCB_EVENT_LIBS)
 
 pkgconfig_DATA = xcb-property.pc