summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Stone <daniel@fooishbar.org>2005-12-09 07:36:25 +0000
committerDaniel Stone <daniel@fooishbar.org>2005-12-09 07:36:25 +0000
commit07a9fc52976796ba3c36a76961ed01c914c4b1c0 (patch)
treec448f6479413349c681686b40d08f3c59afe855b
parent8bba85351b90cb873699ff93703542c2a5d62c33 (diff)
Make tga_seg.c generation srcdir != objdir safe.MODULAR_COPY
-rw-r--r--ChangeLog5
-rw-r--r--src/Makefile.am4
2 files changed, 7 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index bc04d59..0459f4f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-12-09 Daniel Stone <daniel@freedesktop.org>
+
+ * src/Makefile.am:
+ Make tga_seg.c generation srcdir != objdir safe.
+
2005-12-08 Adam Jackson <ajax@freedesktop.org>
* src/Makefile.am:
diff --git a/src/Makefile.am b/src/Makefile.am
index abf95eb..1555548 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -42,6 +42,6 @@ tga_drv_la_SOURCES = \
tga_seg.c \
tga_regs.h
-tga_seg.c: tga_line.c
+tga_seg.c: $(srcdir)/tga_line.c
echo "#define POLYSEGMENT" > tga_seg.c
- cat tga_line.c >> tga_seg.c
+ echo "#include \"$(srcdir)/tga_line.c\"" >> tga_seg.c