diff options
| author | Peter Harris <pharris@opentext.com> | 2012-07-25 15:05:29 -0400 |
|---|---|---|
| committer | Peter Hutterer <peter.hutterer@who-t.net> | 2012-07-26 10:29:02 +1000 |
| commit | fb5db4f004b3a421f3594d8654883d32b2091e99 (patch) | |
| tree | cbf56343171d27d7f4b186c23586664275fd6085 | |
| parent | 3b4415b9ac2ced3fdba29802339bf77fe476909b (diff) | |
Build Xt6
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/Xt6/.gitignore | 7 | ||||
| -rw-r--r-- | xts5/Xt6/Makefile.am | 29 |
4 files changed, 38 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac index 22af8ebf..4cb97ead 100644 --- a/configure.ac +++ b/configure.ac @@ -186,6 +186,7 @@ xts5/Xlib17/Makefile xts5/Xt3/Makefile xts5/Xt4/Makefile xts5/Xt5/Makefile +xts5/Xt6/Makefile xts5/SHAPE/Makefile xts5/XIproto/Makefile xts5/XI/Makefile diff --git a/xts5/Makefile.am b/xts5/Makefile.am index f72fbc8e..76d94fb5 100644 --- a/xts5/Makefile.am +++ b/xts5/Makefile.am @@ -2,7 +2,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 + Xlib16 Xlib17 SHAPE XIproto XI Xt3 Xt4 Xt5 Xt6 noinst_HEADERS = include CLEANFILES = */*/tet_lock bin/xts-config bin/xts-run tetexec.cfg diff --git a/xts5/Xt6/.gitignore b/xts5/Xt6/.gitignore new file mode 100644 index 00000000..4eb7aa6f --- /dev/null +++ b/xts5/Xt6/.gitignore @@ -0,0 +1,7 @@ +ApplicationShellWidget +OverrideShellWidget +ShellWidget +TopLevelShellWidget +TransientShellWidget +VendorShellWidget +WMShellWidget diff --git a/xts5/Xt6/Makefile.am b/xts5/Xt6/Makefile.am new file mode 100644 index 00000000..d4b3cfb6 --- /dev/null +++ b/xts5/Xt6/Makefile.am @@ -0,0 +1,29 @@ +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 = \ + ApplicationShellWidget \ + OverrideShellWidget \ + ShellWidget \ + TopLevelShellWidget \ + TransientShellWidget \ + VendorShellWidget \ + WMShellWidget |