diff options
| author | Jamey Sharp <jamey@minilop.net> | 2006-11-12 17:30:00 -0800 |
|---|---|---|
| committer | Jamey Sharp <jamey@minilop.net> | 2006-11-12 17:30:00 -0800 |
| commit | 0bffedbea51f92c31ad96df17c30f43960ac4afd (patch) | |
| tree | db349dd473eeffd676da650c3cc473b012c45118 | |
| parent | f47242aa7ee7a774960bf66fbc6ac70e46ea5962 (diff) | |
Bug #6781: make util compile with srcdir != builddir.
| -rw-r--r-- | atom/Makefile.am | 4 | ||||
| -rw-r--r-- | configure.ac | 10 |
2 files changed, 7 insertions, 7 deletions
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) |