summaryrefslogtreecommitdiff
path: root/xts5
diff options
context:
space:
mode:
authorAaron Plattner <aplattner@nvidia.com>2010-09-16 08:45:03 -0700
committerAaron Plattner <aplattner@nvidia.com>2010-09-16 09:52:56 -0700
commit5f52061ca072b1ce94ecc9b4a5ab2ea9ea0e1b9f (patch)
treed61bd094aa0d51bd30c837dd3008526c9edff499 /xts5
parente358d60b4e47359b590358b5b64ebffc97c129a8 (diff)
[dist] Distribute files missing from the tarball
Signed-off-by: Aaron Plattner <aplattner@nvidia.com>
Diffstat (limited to 'xts5')
-rw-r--r--xts5/Makefile.am4
-rw-r--r--xts5/Xlib14/Makefile.am2
-rw-r--r--xts5/Xlib4/Makefile.am2
-rw-r--r--xts5/Xlib9/Makefile.am2
-rw-r--r--xts5/fonts/Makefile.am2
-rw-r--r--xts5/scenarios/Makefile.am2
-rw-r--r--xts5/src/bin/mc/Makefile.am1
7 files changed, 9 insertions, 6 deletions
diff --git a/xts5/Makefile.am b/xts5/Makefile.am
index d14a0324..5f691c6c 100644
--- a/xts5/Makefile.am
+++ b/xts5/Makefile.am
@@ -3,13 +3,15 @@ include common.mk
SUBDIRS = . fonts src scenarios Xproto Xopen Xlib3 Xlib4 Xlib5 Xlib6 \
Xlib7 Xlib8 Xlib9 Xlib10 Xlib11 Xlib12 Xlib13 Xlib14 Xlib15 \
Xlib16 Xlib17 XIproto XI
+noinst_HEADERS = include
CLEANFILES = */*/tet_lock bin/xts-config bin/xts-run tetexec.cfg
LOGFILES = */*/*.log
DISTCLEANFILES = $(LOGFILES) */*/*.log.tmp
+EXTRA_DIST = bin/xts-config.in bin/xts-run.in
bin_SCRIPTS = bin/xts-config bin/xts-run
-xts5_DATA = tetexec.cfg.in tet_scen tet_code
+dist_xts5_DATA = tetexec.cfg.in tet_scen tet_code
xts5dir = $(datadir)/xts5
check_DATA = tetexec.cfg
diff --git a/xts5/Xlib14/Makefile.am b/xts5/Xlib14/Makefile.am
index b61e5b5e..d8cf245c 100644
--- a/xts5/Xlib14/Makefile.am
+++ b/xts5/Xlib14/Makefile.am
@@ -65,4 +65,4 @@ tprogs = \
XwcTextExtents
# Data files for test programs
-nobase_testprog_DATA = $(srcdir)/*/*.dat
+nobase_dist_testprog_DATA = $(srcdir)/*/*.dat
diff --git a/xts5/Xlib4/Makefile.am b/xts5/Xlib4/Makefile.am
index 84f5171a..3188a111 100644
--- a/xts5/Xlib4/Makefile.am
+++ b/xts5/Xlib4/Makefile.am
@@ -48,4 +48,4 @@ tprogs = \
XVisualIDFromVisual
# Data files for test programs
-nobase_testprog_DATA = $(srcdir)/*/*.dat
+nobase_dist_testprog_DATA = $(srcdir)/*/*.dat
diff --git a/xts5/Xlib9/Makefile.am b/xts5/Xlib9/Makefile.am
index b2c95120..56fffdef 100644
--- a/xts5/Xlib9/Makefile.am
+++ b/xts5/Xlib9/Makefile.am
@@ -65,4 +65,4 @@ tprogs = \
XUnloadFont
# Data files for test programs
-nobase_testprog_DATA = $(srcdir)/*/*.dat
+nobase_dist_testprog_DATA = $(srcdir)/*/*.dat
diff --git a/xts5/fonts/Makefile.am b/xts5/fonts/Makefile.am
index df4297e8..b52631ed 100644
--- a/xts5/fonts/Makefile.am
+++ b/xts5/fonts/Makefile.am
@@ -13,7 +13,7 @@ FONTBDFS = xtfont0.bdf xtfont1.bdf xtfont2.bdf xtfont3.bdf xtfont4.bdf \
FONTPCFS = $(FONTBDFS:.bdf=.pcf)
xts5fontsdir = $(datadir)/xts5/fonts
-xts5fonts_DATA = $(FONTPCFS) fonts.dir
+dist_xts5fonts_DATA = $(FONTPCFS) fonts.dir
.bdf.pcf:
$(BDFTOPCF) -t -o $@ $<
diff --git a/xts5/scenarios/Makefile.am b/xts5/scenarios/Makefile.am
index e9fdb672..85d9d3ce 100644
--- a/xts5/scenarios/Makefile.am
+++ b/xts5/scenarios/Makefile.am
@@ -1,6 +1,6 @@
include ../common.mk
-scenarios_DATA = \
+dist_scenarios_DATA = \
shape_scen \
XIproto_scen \
XI_scen \
diff --git a/xts5/src/bin/mc/Makefile.am b/xts5/src/bin/mc/Makefile.am
index 14f599fe..fb762947 100644
--- a/xts5/src/bin/mc/Makefile.am
+++ b/xts5/src/bin/mc/Makefile.am
@@ -12,6 +12,7 @@ AM_CFLAGS = -I$(top_srcdir)/include \
noinst_PROGRAMS = mc
mc_SOURCES = main.c sections.c files.c shortname.c error.c gccomps.c set.c \
expand.c code.c make.c ma.c cond.c mas.c
+noinst_HEADERS = mc.h mcproto.h
# Build mc for the 'dist' rule, because it's used to generate .c files that are
# distributed.