diff options
| author | Peter Harris <pharris@opentext.com> | 2012-07-25 15:28:40 -0400 |
|---|---|---|
| committer | Peter Hutterer <peter.hutterer@who-t.net> | 2012-07-26 10:31:52 +1000 |
| commit | ab8b0f21ad1ab3e9edd6ba3f385768359a308a1b (patch) | |
| tree | e6a878110b7046a51d7f4c04baffef3f098c7675 | |
| parent | fa8368b5979b6ffe430eb105b49df9ddc5543132 (diff) | |
Build XtE
Rename StringDefs.h.m to StringDefs.m to avoid confusing
AutoFoo.
Signed-off-by: Peter Harris <pharris@opentext.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
| -rw-r--r-- | configure.ac | 1 | ||||
| -rw-r--r-- | xts5/Makefile.am | 2 | ||||
| -rw-r--r-- | xts5/XtE/.gitignore | 1 | ||||
| -rw-r--r-- | xts5/XtE/Makefile.am | 23 | ||||
| -rw-r--r-- | xts5/XtE/StringDefs.m (renamed from xts5/XtE/StringDefs.h.m) | 4 | ||||
| -rw-r--r-- | xts5/scenarios/XtE_scen | 4 | ||||
| -rw-r--r-- | xts5/tet_scen | 6 |
7 files changed, 33 insertions, 8 deletions
diff --git a/configure.ac b/configure.ac index 668f1bf3..6c162dc0 100644 --- a/configure.ac +++ b/configure.ac @@ -197,6 +197,7 @@ xts5/Xt13/Makefile xts5/Xt14/Makefile xts5/Xt15/Makefile xts5/XtC/Makefile +xts5/XtE/Makefile xts5/SHAPE/Makefile xts5/XIproto/Makefile xts5/XI/Makefile diff --git a/xts5/Makefile.am b/xts5/Makefile.am index 0d560202..bcebcbb9 100644 --- a/xts5/Makefile.am +++ b/xts5/Makefile.am @@ -3,7 +3,7 @@ include common.mk SUBDIRS = . fonts src scenarios Xproto Xopen Xlib3 Xlib4 Xlib5 Xlib6 \ Xlib7 Xlib8 Xlib9 Xlib10 Xlib11 Xlib12 Xlib13 Xlib14 Xlib15 \ Xlib16 Xlib17 SHAPE XIproto XI Xt3 Xt4 Xt5 Xt6 Xt7 Xt8 Xt9 \ - Xt10 Xt11 Xt12 Xt13 Xt14 Xt15 XtC + Xt10 Xt11 Xt12 Xt13 Xt14 Xt15 XtC XtE noinst_HEADERS = include CLEANFILES = */*/tet_lock bin/xts-config bin/xts-run tetexec.cfg diff --git a/xts5/XtE/.gitignore b/xts5/XtE/.gitignore new file mode 100644 index 00000000..378e7e2c --- /dev/null +++ b/xts5/XtE/.gitignore @@ -0,0 +1 @@ +StringDefs diff --git a/xts5/XtE/Makefile.am b/xts5/XtE/Makefile.am new file mode 100644 index 00000000..49cd208b --- /dev/null +++ b/xts5/XtE/Makefile.am @@ -0,0 +1,23 @@ +include ../common.mk +AUTOMAKE_OPTIONS = subdir-objects + +AM_CFLAGS = -I$(top_srcdir)/include \ + -I$(top_srcdir)/src/tet3/inc \ + -I$(top_srcdir)/xts5/include \ + $(XTS_CFLAGS) $(XAW_CFLAGS) +LDADD = $(top_builddir)/src/tet3/tcm/libtcmmain.la \ + $(top_builddir)/xts5/src/libxts5.la \ + $(top_builddir)/xts5/src/libXtTest/libXtTest.la \ + $(top_builddir)/xts5/src/libXtaw/libXtaw.la \ + $(top_builddir)/src/tet3/apilib/libapi.la \ + $(top_builddir)/src/tet3/apilib/libapi_s.la \ + $(XTS_LIBS) $(XAW_LIBS) + +testprogdir = $(libexecdir)/$(subdir) +nobase_testprog_PROGRAMS = $(tprogs) +BUILT_SOURCES = $(tprogs:=.c) +EXTRA_DIST = $(addsuffix .m,$(filter-out %_m,$(tprogs))) +DISTCLEANFILES = $(BUILT_SOURCES) + +tprogs = \ + StringDefs diff --git a/xts5/XtE/StringDefs.h.m b/xts5/XtE/StringDefs.m index 428f90b0..9b9712e1 100644 --- a/xts5/XtE/StringDefs.h.m +++ b/xts5/XtE/StringDefs.m @@ -25,7 +25,7 @@ All Rights Reserved. >># >># Project: VSW5 >># ->># File: xts/XtE/StringDefs.h.m +>># File: xts/XtE/StringDefs.m >># >># Description: >># Tests for StringDefs.h contents @@ -54,7 +54,7 @@ All Rights Reserved. >># Prepare for GA Release >># >>EXTERN ->>TITLE StringDefs.h XtE +>>TITLE StringDefs XtE >>ASSERTION Good A The header file StringDefs.h shall contain the definitions specified in Appendix E of the Specification. diff --git a/xts5/scenarios/XtE_scen b/xts5/scenarios/XtE_scen index 3cc76a17..6de29e51 100644 --- a/xts5/scenarios/XtE_scen +++ b/xts5/scenarios/XtE_scen @@ -57,5 +57,5 @@ # Prepare for GA Release # - "VSW5TESTSUITE CASE StringDefs.h 1" - /XtE/StringDefs.h + "VSW5TESTSUITE CASE StringDefs 1" + /XtE/StringDefs diff --git a/xts5/tet_scen b/xts5/tet_scen index 7d2abd9f..a7a65a2c 100644 --- a/xts5/tet_scen +++ b/xts5/tet_scen @@ -4715,6 +4715,6 @@ XtError #Discrete tests for Xt Appendix E -StringDefs.h - "VSW5TESTSUITE CASE StringDefs.h 1" - /XtE/StringDefs.h +StringDefs + "VSW5TESTSUITE CASE StringDefs 1" + /XtE/StringDefs |