summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--Makefile.am4
2 files changed, 7 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 5e6ab56..09f547a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-05-24 Alexander Gottwald <ago at freedesktop dot org>
+
+ * Makefile.am:
+ separation of source and build directories
+
2005-05-22 Alan Coopersmith <alan.coopersmith@sun.com>
* man/Makefile.am: Convert man pages to long file names
diff --git a/Makefile.am b/Makefile.am
index a18d331..e0ba2e2 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -23,7 +23,7 @@
SUBDIRS = util . src include man
-AM_CFLAGS = $(XT_CFLAGS) -I$(top_srcdir)/include -I$(top_srcdir)/include/X11
+AM_CFLAGS = $(XT_CFLAGS) -I$(top_srcdir)/include -I$(top_srcdir)/include/X11 -I$(top_builddir)/include/X11
pkgconfigdir = $(libdir)/pkgconfig
@@ -51,7 +51,7 @@ STRING_LIST = $(top_srcdir)/util/string.list
all-local: $(BUILT_FILES)
$(BUILT_FILES):
- $(top_builddir)/util/makestrs $(STRINGSABIOPTIONS) < $(STRING_LIST) > StringDefs.c
+ $(top_builddir)/util/makestrs -i $(top_srcdir) $(STRINGSABIOPTIONS) < $(STRING_LIST) > StringDefs.c
$(install_sh_DATA) StringDefs.c $(top_builddir)/src
$(install_sh_DATA) $(top_builddir)/StringDefs.h $(top_builddir)/include/X11/
$(install_sh_DATA) $(top_builddir)/Shell.h $(top_builddir)/include/X11/