summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorDan Nicholson <dbn.lists@gmail.com>2009-09-16 06:46:59 -0700
committerDan Nicholson <dbn.lists@gmail.com>2009-09-16 06:46:59 -0700
commiteab850ed3b1e763e247ec424fad68bce78b9ff04 (patch)
tree4ff92120fb417f08174f6cac5117552d0a4791d0 /src
parent9f1b4c23f2de00b6921958a0b041aa0e8f2c44ef (diff)
parent25ce85eed58da8608c5573b23fc821869fc9bc4a (diff)
Merge commit 'whot/master' into master
I decided to keep the Xproto renaming I had, which restored the original names with the p prefix. Conflicts: xts5/scenarios/Xproto_scen xts5/tet_scen xts5/tset/Xproto/.gitignore xts5/tset/Xproto/AllocColorCells/AllocColorCells.m ...
Diffstat (limited to 'src')
-rw-r--r--src/tet3/tcc/Makefile.am2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/tet3/tcc/Makefile.am b/src/tet3/tcc/Makefile.am
index 4e2d0cc4..fc078aa5 100644
--- a/src/tet3/tcc/Makefile.am
+++ b/src/tet3/tcc/Makefile.am
@@ -1,5 +1,5 @@
AM_CPPFLAGS = -I../inc -I$(top_srcdir)/include
-noinst_PROGRAMS = tcc
+bin_PROGRAMS = tcc
tcc_LDADD = ../tcclib/libtcc.la
tcc_SOURCES = cleanup.c \
config.c \