diff options
author | Dan Nicholson <dbn.lists@gmail.com> | 2009-09-16 06:46:59 -0700 |
---|---|---|
committer | Dan Nicholson <dbn.lists@gmail.com> | 2009-09-16 06:46:59 -0700 |
commit | eab850ed3b1e763e247ec424fad68bce78b9ff04 (patch) | |
tree | 4ff92120fb417f08174f6cac5117552d0a4791d0 /xts5/tset/Xlib4/Makefile.am | |
parent | 9f1b4c23f2de00b6921958a0b041aa0e8f2c44ef (diff) | |
parent | 25ce85eed58da8608c5573b23fc821869fc9bc4a (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 'xts5/tset/Xlib4/Makefile.am')
-rw-r--r-- | xts5/tset/Xlib4/Makefile.am | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/xts5/tset/Xlib4/Makefile.am b/xts5/tset/Xlib4/Makefile.am index d5078a8f..9758c5d2 100644 --- a/xts5/tset/Xlib4/Makefile.am +++ b/xts5/tset/Xlib4/Makefile.am @@ -4,7 +4,7 @@ AUTOMAKE_OPTIONS = subdir-objects AM_CFLAGS = $(XTS_LCFLAGS) $(XTS_CFLAGS) LDADD = $(TCM) $(XTS_LLIBS) $(XTS_LIBS) -check_PROGRAMS = $(tprogs) +libexec_PROGRAMS = $(tprogs) BUILT_SOURCES = $(tprogs:$(EXEEXT)=.c) CLEANFILES = $(BUILT_SOURCES) |