tprogs lists the test programs without $(EXEEXT), so substituting the $(EXEEXT) with .c to get BUILD_SOURCES fails to work correctly when $(EXEEXT) isn't empty
Signed-off-by: Jon TURNEY <jon.tur...@dronecode.org.uk> --- xts5/XI/Makefile.am | 2 +- xts5/XIproto/Makefile.am | 2 +- xts5/Xlib10/Makefile.am | 2 +- xts5/Xlib11/Makefile.am | 2 +- xts5/Xlib12/Makefile.am | 2 +- xts5/Xlib13/Makefile.am | 2 +- xts5/Xlib14/Makefile.am | 2 +- xts5/Xlib15/Makefile.am | 2 +- xts5/Xlib16/Makefile.am | 2 +- xts5/Xlib17/Makefile.am | 2 +- xts5/Xlib3/Makefile.am | 2 +- xts5/Xlib4/Makefile.am | 2 +- xts5/Xlib5/Makefile.am | 2 +- xts5/Xlib6/Makefile.am | 2 +- xts5/Xlib7/Makefile.am | 2 +- xts5/Xlib8/Makefile.am | 2 +- xts5/Xlib9/Makefile.am | 2 +- xts5/Xopen/Makefile.am | 2 +- xts5/Xproto/Makefile.am | 2 +- 19 files changed, 19 insertions(+), 19 deletions(-) diff --git a/xts5/XI/Makefile.am b/xts5/XI/Makefile.am index 2364f2f..7c6e95a 100644 --- a/xts5/XI/Makefile.am +++ b/xts5/XI/Makefile.am @@ -14,7 +14,7 @@ LDADD = $(top_builddir)/src/tet3/tcm/libtcmmain.la \ testprogdir = $(libexecdir)/$(subdir) nobase_testprog_PROGRAMS = $(tprogs) -BUILT_SOURCES = $(tprogs:$(EXEEXT)=.c) +BUILT_SOURCES = $(tprogs:=.c) CLEANFILES = $(BUILT_SOURCES) tprogs = \ diff --git a/xts5/XIproto/Makefile.am b/xts5/XIproto/Makefile.am index 3200200..986f864 100644 --- a/xts5/XIproto/Makefile.am +++ b/xts5/XIproto/Makefile.am @@ -14,7 +14,7 @@ LDADD = $(top_builddir)/src/tet3/tcm/libtcmmain.la \ testprogdir = $(libexecdir)/$(subdir) nobase_testprog_PROGRAMS = $(tprogs) -BUILT_SOURCES = $(tprogs:$(EXEEXT)=.c) +BUILT_SOURCES = $(tprogs:=.c) CLEANFILES = $(BUILT_SOURCES) tprogs = \ diff --git a/xts5/Xlib10/Makefile.am b/xts5/Xlib10/Makefile.am index 1d72573..2812de5 100644 --- a/xts5/Xlib10/Makefile.am +++ b/xts5/Xlib10/Makefile.am @@ -14,7 +14,7 @@ LDADD = $(top_builddir)/src/tet3/tcm/libtcmmain.la \ testprogdir = $(libexecdir)/$(subdir) nobase_testprog_PROGRAMS = $(tprogs) -BUILT_SOURCES = $(tprogs:$(EXEEXT)=.c) +BUILT_SOURCES = $(tprogs:=.c) CLEANFILES = $(BUILT_SOURCES) tprogs = \ diff --git a/xts5/Xlib11/Makefile.am b/xts5/Xlib11/Makefile.am index 4d4834f..68fa129 100644 --- a/xts5/Xlib11/Makefile.am +++ b/xts5/Xlib11/Makefile.am @@ -14,7 +14,7 @@ LDADD = $(top_builddir)/src/tet3/tcm/libtcmmain.la \ testprogdir = $(libexecdir)/$(subdir) nobase_testprog_PROGRAMS = $(tprogs) -BUILT_SOURCES = $(tprogs:$(EXEEXT)=.c) +BUILT_SOURCES = $(tprogs:=.c) CLEANFILES = $(BUILT_SOURCES) tprogs = \ diff --git a/xts5/Xlib12/Makefile.am b/xts5/Xlib12/Makefile.am index b215452..36728e2 100644 --- a/xts5/Xlib12/Makefile.am +++ b/xts5/Xlib12/Makefile.am @@ -14,7 +14,7 @@ LDADD = $(top_builddir)/src/tet3/tcm/libtcmmain.la \ testprogdir = $(libexecdir)/$(subdir) nobase_testprog_PROGRAMS = $(tprogs) -BUILT_SOURCES = $(tprogs:$(EXEEXT)=.c) +BUILT_SOURCES = $(tprogs:=.c) CLEANFILES = $(BUILT_SOURCES) tprogs = \ diff --git a/xts5/Xlib13/Makefile.am b/xts5/Xlib13/Makefile.am index 14ff948..855f247 100644 --- a/xts5/Xlib13/Makefile.am +++ b/xts5/Xlib13/Makefile.am @@ -14,7 +14,7 @@ LDADD = $(top_builddir)/src/tet3/tcm/libtcmmain.la \ testprogdir = $(libexecdir)/$(subdir) nobase_testprog_PROGRAMS = $(tprogs) -BUILT_SOURCES = $(tprogs:$(EXEEXT)=.c) +BUILT_SOURCES = $(tprogs:=.c) CLEANFILES = $(BUILT_SOURCES) tprogs = \ diff --git a/xts5/Xlib14/Makefile.am b/xts5/Xlib14/Makefile.am index 9d50b46..df11217 100644 --- a/xts5/Xlib14/Makefile.am +++ b/xts5/Xlib14/Makefile.am @@ -15,7 +15,7 @@ LDADD = $(top_builddir)/src/tet3/tcm/libtcmmain.la \ testprogdir = $(libexecdir)/$(subdir) nobase_testprog_PROGRAMS = $(tprogs) -BUILT_SOURCES = $(tprogs:$(EXEEXT)=.c) +BUILT_SOURCES = $(tprogs:=.c) CLEANFILES = $(BUILT_SOURCES) tprogs = \ diff --git a/xts5/Xlib15/Makefile.am b/xts5/Xlib15/Makefile.am index e9b0ddf..a9029ed 100644 --- a/xts5/Xlib15/Makefile.am +++ b/xts5/Xlib15/Makefile.am @@ -14,7 +14,7 @@ LDADD = $(top_builddir)/src/tet3/tcm/libtcmmain.la \ testprogdir = $(libexecdir)/$(subdir) nobase_testprog_PROGRAMS = $(tprogs) -BUILT_SOURCES = $(tprogs:$(EXEEXT)=.c) +BUILT_SOURCES = $(tprogs:=.c) CLEANFILES = $(BUILT_SOURCES) XDefaultString_LDADD = $(LDADD) $(top_builddir)/xts5/src/libXR5/libXR5.la diff --git a/xts5/Xlib16/Makefile.am b/xts5/Xlib16/Makefile.am index eabe0ad..debecac 100644 --- a/xts5/Xlib16/Makefile.am +++ b/xts5/Xlib16/Makefile.am @@ -14,7 +14,7 @@ LDADD = $(top_builddir)/src/tet3/tcm/libtcmmain.la \ testprogdir = $(libexecdir)/$(subdir) nobase_testprog_PROGRAMS = $(tprogs) -BUILT_SOURCES = $(tprogs:$(EXEEXT)=.c) +BUILT_SOURCES = $(tprogs:=.c) CLEANFILES = $(BUILT_SOURCES) XrmCombineDatabase_LDADD = $(LDADD) $(top_builddir)/xts5/src/libXR5/libXR5.la diff --git a/xts5/Xlib17/Makefile.am b/xts5/Xlib17/Makefile.am index 4bd7bf0..b0a1547 100644 --- a/xts5/Xlib17/Makefile.am +++ b/xts5/Xlib17/Makefile.am @@ -14,7 +14,7 @@ LDADD = $(top_builddir)/src/tet3/tcm/libtcmmain.la \ testprogdir = $(libexecdir)/$(subdir) nobase_testprog_PROGRAMS = $(tprogs) -BUILT_SOURCES = $(tprogs:$(EXEEXT)=.c) +BUILT_SOURCES = $(tprogs:=.c) CLEANFILES = $(BUILT_SOURCES) tprogs = \ diff --git a/xts5/Xlib3/Makefile.am b/xts5/Xlib3/Makefile.am index a9abce1..129357c 100644 --- a/xts5/Xlib3/Makefile.am +++ b/xts5/Xlib3/Makefile.am @@ -14,7 +14,7 @@ LDADD = $(top_builddir)/src/tet3/tcm/libtcmmain.la \ testprogdir = $(libexecdir)/$(subdir) nobase_testprog_PROGRAMS = $(tprogs) -BUILT_SOURCES = $(tprogs:$(EXEEXT)=.c) +BUILT_SOURCES = $(tprogs:=.c) CLEANFILES = $(BUILT_SOURCES) # Tests ending in _m test the macro version of Xlib diff --git a/xts5/Xlib4/Makefile.am b/xts5/Xlib4/Makefile.am index bbc2f16..0909520 100644 --- a/xts5/Xlib4/Makefile.am +++ b/xts5/Xlib4/Makefile.am @@ -14,7 +14,7 @@ LDADD = $(top_builddir)/src/tet3/tcm/libtcmmain.la \ testprogdir = $(libexecdir)/$(subdir) nobase_testprog_PROGRAMS = $(tprogs) -BUILT_SOURCES = $(tprogs:$(EXEEXT)=.c) +BUILT_SOURCES = $(tprogs:=.c) CLEANFILES = $(BUILT_SOURCES) tprogs = \ diff --git a/xts5/Xlib5/Makefile.am b/xts5/Xlib5/Makefile.am index f7daebf..adbb5bc 100644 --- a/xts5/Xlib5/Makefile.am +++ b/xts5/Xlib5/Makefile.am @@ -14,7 +14,7 @@ LDADD = $(top_builddir)/src/tet3/tcm/libtcmmain.la \ testprogdir = $(libexecdir)/$(subdir) nobase_testprog_PROGRAMS = $(tprogs) -BUILT_SOURCES = $(tprogs:$(EXEEXT)=.c) +BUILT_SOURCES = $(tprogs:=.c) CLEANFILES = $(BUILT_SOURCES) tprogs = \ diff --git a/xts5/Xlib6/Makefile.am b/xts5/Xlib6/Makefile.am index 880fca9..94cf803 100644 --- a/xts5/Xlib6/Makefile.am +++ b/xts5/Xlib6/Makefile.am @@ -14,7 +14,7 @@ LDADD = $(top_builddir)/src/tet3/tcm/libtcmmain.la \ testprogdir = $(libexecdir)/$(subdir) nobase_testprog_PROGRAMS = $(tprogs) -BUILT_SOURCES = $(tprogs:$(EXEEXT)=.c) +BUILT_SOURCES = $(tprogs:=.c) CLEANFILES = $(BUILT_SOURCES) tprogs = \ diff --git a/xts5/Xlib7/Makefile.am b/xts5/Xlib7/Makefile.am index b22b0c4..b65903c 100644 --- a/xts5/Xlib7/Makefile.am +++ b/xts5/Xlib7/Makefile.am @@ -15,7 +15,7 @@ LDADD = $(top_builddir)/src/tet3/tcm/libtcmmain.la \ testprogdir = $(libexecdir)/$(subdir) nobase_testprog_PROGRAMS = $(tprogs) -BUILT_SOURCES = $(tprogs:$(EXEEXT)=.c) +BUILT_SOURCES = $(tprogs:=.c) CLEANFILES = $(BUILT_SOURCES) tprogs = \ diff --git a/xts5/Xlib8/Makefile.am b/xts5/Xlib8/Makefile.am index 9055f99..c505a16 100644 --- a/xts5/Xlib8/Makefile.am +++ b/xts5/Xlib8/Makefile.am @@ -14,7 +14,7 @@ LDADD = $(top_builddir)/src/tet3/tcm/libtcmmain.la \ testprogdir = $(libexecdir)/$(subdir) nobase_testprog_PROGRAMS = $(tprogs) -BUILT_SOURCES = $(tprogs:$(EXEEXT)=.c) +BUILT_SOURCES = $(tprogs:=.c) CLEANFILES = $(BUILT_SOURCES) XFlushGC_LDADD = $(LDADD) $(top_builddir)/xts5/src/libXR5/libXR5.la diff --git a/xts5/Xlib9/Makefile.am b/xts5/Xlib9/Makefile.am index aafe355..caceb04 100644 --- a/xts5/Xlib9/Makefile.am +++ b/xts5/Xlib9/Makefile.am @@ -14,7 +14,7 @@ LDADD = $(top_builddir)/src/tet3/tcm/libtcmmain.la \ testprogdir = $(libexecdir)/$(subdir) nobase_testprog_PROGRAMS = $(tprogs) -BUILT_SOURCES = $(tprogs:$(EXEEXT)=.c) +BUILT_SOURCES = $(tprogs:=.c) CLEANFILES = $(BUILT_SOURCES) tprogs = \ diff --git a/xts5/Xopen/Makefile.am b/xts5/Xopen/Makefile.am index 1ef041a..62f8ae6 100644 --- a/xts5/Xopen/Makefile.am +++ b/xts5/Xopen/Makefile.am @@ -14,7 +14,7 @@ LDADD = $(top_builddir)/src/tet3/tcm/libtcmmain.la \ testprogdir = $(libexecdir)/$(subdir) nobase_testprog_PROGRAMS = $(tprogs) -BUILT_SOURCES = $(tprogs:$(EXEEXT)=.c) +BUILT_SOURCES = $(tprogs:=.c) CLEANFILES = $(BUILT_SOURCES) tprogs = \ diff --git a/xts5/Xproto/Makefile.am b/xts5/Xproto/Makefile.am index 833332f..32e68f9 100644 --- a/xts5/Xproto/Makefile.am +++ b/xts5/Xproto/Makefile.am @@ -12,7 +12,7 @@ LDADD = $(top_builddir)/src/tet3/tcm/libtcmmain.la \ testprogdir = $(libexecdir)/$(subdir) nobase_testprog_PROGRAMS = $(tprogs) -BUILT_SOURCES = $(tprogs:$(EXEEXT)=.c) +BUILT_SOURCES = $(tprogs:=.c) CLEANFILES = $(BUILT_SOURCES) tprogs = \ -- 1.6.6.1 _______________________________________________ xorg-devel@lists.x.org: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: http://lists.x.org/mailman/listinfo/xorg-devel