diff options
Diffstat (limited to 'xts5')
39 files changed, 315 insertions, 196 deletions
diff --git a/xts5/Makefile.am b/xts5/Makefile.am index 33cdcef3..44608b69 100644 --- a/xts5/Makefile.am +++ b/xts5/Makefile.am @@ -24,10 +24,10 @@ bin/xts-run: bin/xts-run.in # Setup for testing TCC = $(top_builddir)/src/tet3/tcc/tcc$(EXEEXT) -run_tcc = TET_ROOT='$(TET_ROOT)' $(TCC) -e -a $(abs_builddir) \ +run_tcc = TET_ROOT='$(top_srcdir)' $(TCC) -e -a $(abs_builddir) \ -x tetexec.cfg xts5 scenario = -XTS_CONFIG = TET_ROOT='$(TET_ROOT)' XSET='$(XSET)' XDPYINFO='$(XDPYINFO)' \ +XTS_CONFIG = TET_ROOT='$(top_srcdir)' XSET='$(XSET)' XDPYINFO='$(XDPYINFO)' \ $(PERL) -p $(srcdir)/bin/xts-config tetexec.cfg: tetexec.cfg.in $(srcdir)/bin/xts-config diff --git a/xts5/XI/Makefile.am b/xts5/XI/Makefile.am index e05d6bc9..e5d219d0 100644 --- a/xts5/XI/Makefile.am +++ b/xts5/XI/Makefile.am @@ -1,8 +1,16 @@ include ../common.mk AUTOMAKE_OPTIONS = subdir-objects -AM_CFLAGS = $(XTS_LCFLAGS) $(XTS_CFLAGS) -LDADD = $(TCM) $(XTS_LLIBS) $(XTS_LIBS) +AM_CFLAGS = -I$(top_srcdir)/include \ + -I$(top_srcdir)/src/tet3/inc \ + -I$(top_srcdir)/xts5/include \ + $(XTS_CFLAGS) +LDADD = $(top_builddir)/src/tet3/tcm/libtcmmain.la \ + $(top_builddir)/xts5/src/xim/libximtest.a \ + $(top_builddir)/xts5/src/lib/libxtest.a \ + $(top_builddir)/xts5/fonts/libfont.a \ + $(top_builddir)/src/tet3/apilib/libapi.la \ + $(XTS_LIBS) testprogdir = $(libexecdir)/$(subdir) nobase_testprog_PROGRAMS = $(tprogs) diff --git a/xts5/XIproto/Makefile.am b/xts5/XIproto/Makefile.am index c4ce3fda..30dfae2a 100644 --- a/xts5/XIproto/Makefile.am +++ b/xts5/XIproto/Makefile.am @@ -1,8 +1,16 @@ include ../common.mk AUTOMAKE_OPTIONS = subdir-objects -AM_CFLAGS = $(XP_LCFLAGS) $(XP_CFLAGS) -LDADD = $(TCM) $(XP_LLIBS) $(XP_LIBS) +AM_CFLAGS = -I$(top_srcdir)/include \ + -I$(top_srcdir)/src/tet3/inc \ + -I$(top_srcdir)/xts5/include \ + $(XP_CFLAGS) +LDADD = $(top_builddir)/src/tet3/tcm/libtcmmain.la \ + $(top_builddir)/xts5/src/libproto/libXst.a \ + $(top_builddir)/xts5/src/lib/libxtest.a \ + $(top_builddir)/xts5/fonts/libfont.a \ + $(top_builddir)/src/tet3/apilib/libapi.la \ + $(XP_LIBS) testprogdir = $(libexecdir)/$(subdir) nobase_testprog_PROGRAMS = $(tprogs) diff --git a/xts5/Xlib10/Makefile.am b/xts5/Xlib10/Makefile.am index 7ea699f3..8a778133 100644 --- a/xts5/Xlib10/Makefile.am +++ b/xts5/Xlib10/Makefile.am @@ -1,8 +1,16 @@ include ../common.mk AUTOMAKE_OPTIONS = subdir-objects -AM_CFLAGS = $(XTS_LCFLAGS) $(XTS_CFLAGS) -LDADD = $(TCM) $(XTS_LLIBS) $(XTS_LIBS) +AM_CFLAGS = -I$(top_srcdir)/include \ + -I$(top_srcdir)/src/tet3/inc \ + -I$(top_srcdir)/xts5/include \ + $(XTS_CFLAGS) +LDADD = $(top_builddir)/src/tet3/tcm/libtcmmain.la \ + $(top_builddir)/xts5/src/xim/libximtest.a \ + $(top_builddir)/xts5/src/lib/libxtest.a \ + $(top_builddir)/xts5/fonts/libfont.a \ + $(top_builddir)/src/tet3/apilib/libapi.la \ + $(XTS_LIBS) testprogdir = $(libexecdir)/$(subdir) nobase_testprog_PROGRAMS = $(tprogs) diff --git a/xts5/Xlib11/Makefile.am b/xts5/Xlib11/Makefile.am index 1348cc2e..f2a56c1a 100644 --- a/xts5/Xlib11/Makefile.am +++ b/xts5/Xlib11/Makefile.am @@ -1,8 +1,16 @@ include ../common.mk AUTOMAKE_OPTIONS = subdir-objects -AM_CFLAGS = $(XTS_LCFLAGS) $(XTS_CFLAGS) -LDADD = $(TCM) $(XTS_LLIBS) $(XTS_LIBS) +AM_CFLAGS = -I$(top_srcdir)/include \ + -I$(top_srcdir)/src/tet3/inc \ + -I$(top_srcdir)/xts5/include \ + $(XTS_CFLAGS) +LDADD = $(top_builddir)/src/tet3/tcm/libtcmmain.la \ + $(top_builddir)/xts5/src/xim/libximtest.a \ + $(top_builddir)/xts5/src/lib/libxtest.a \ + $(top_builddir)/xts5/fonts/libfont.a \ + $(top_builddir)/src/tet3/apilib/libapi.la \ + $(XTS_LIBS) testprogdir = $(libexecdir)/$(subdir) nobase_testprog_PROGRAMS = $(tprogs) diff --git a/xts5/Xlib12/Makefile.am b/xts5/Xlib12/Makefile.am index c94dc220..0893d03a 100644 --- a/xts5/Xlib12/Makefile.am +++ b/xts5/Xlib12/Makefile.am @@ -1,8 +1,16 @@ include ../common.mk AUTOMAKE_OPTIONS = subdir-objects -AM_CFLAGS = $(XTS_LCFLAGS) $(XTS_CFLAGS) -LDADD = $(TCM) $(XTS_LLIBS) $(XTS_LIBS) +AM_CFLAGS = -I$(top_srcdir)/include \ + -I$(top_srcdir)/src/tet3/inc \ + -I$(top_srcdir)/xts5/include \ + $(XTS_CFLAGS) +LDADD = $(top_builddir)/src/tet3/tcm/libtcmmain.la \ + $(top_builddir)/xts5/src/xim/libximtest.a \ + $(top_builddir)/xts5/src/lib/libxtest.a \ + $(top_builddir)/xts5/fonts/libfont.a \ + $(top_builddir)/src/tet3/apilib/libapi.la \ + $(XTS_LIBS) testprogdir = $(libexecdir)/$(subdir) nobase_testprog_PROGRAMS = $(tprogs) @@ -40,4 +48,9 @@ tprogs = \ # Auxiliary programs run from tests nobase_testprog_PROGRAMS += XDisplayName/Test1 -XDisplayName_Test1_LDADD = $(TCMCHILD) $(XTS_LLIBS) $(XTS_LIBS) +XDisplayName_Test1_LDADD = $(top_builddir)/src/tet3/tcm/libtcmchild.la \ + $(top_builddir)/xts5/src/xim/libximtest.a \ + $(top_builddir)/xts5/src/lib/libxtest.a \ + $(top_builddir)/xts5/fonts/libfont.a \ + $(top_builddir)/src/tet3/apilib/libapi.la \ + $(XTS_LIBS) diff --git a/xts5/Xlib12/XDisplayName/XDisplayName.m b/xts5/Xlib12/XDisplayName/XDisplayName.m index 88e4400b..81d7dfc2 100644 --- a/xts5/Xlib12/XDisplayName/XDisplayName.m +++ b/xts5/Xlib12/XDisplayName/XDisplayName.m @@ -120,8 +120,8 @@ AUXCLEAN=Test1.o Test1 all: Test -Test1 : Test1.o $(LIBS) $(TCMCHILD) - $(CC) $(LDFLAGS) -o $@ Test1.o $(TCMCHILD) $(LIBLOCAL) $(LIBS) $(SYSLIBS) +Test1 : Test1.o $(LIBS) $(top_builddir)/src/tet3/tcm/libtcmchild.la + $(CC) $(LDFLAGS) -o $@ Test1.o $(top_builddir)/src/tet3/tcm/libtcmchild.la $(LIBLOCAL) $(LIBS) $(SYSLIBS) # # End of section copied from the .m file. diff --git a/xts5/Xlib13/Makefile.am b/xts5/Xlib13/Makefile.am index a78c5e86..0b014266 100644 --- a/xts5/Xlib13/Makefile.am +++ b/xts5/Xlib13/Makefile.am @@ -1,8 +1,16 @@ include ../common.mk AUTOMAKE_OPTIONS = subdir-objects -AM_CFLAGS = $(XTS_LCFLAGS) $(XTS_CFLAGS) -LDADD = $(TCM) $(XTS_LLIBS) $(XTS_LIBS) +AM_CFLAGS = -I$(top_srcdir)/include \ + -I$(top_srcdir)/src/tet3/inc \ + -I$(top_srcdir)/xts5/include \ + $(XTS_CFLAGS) +LDADD = $(top_builddir)/src/tet3/tcm/libtcmmain.la \ + $(top_builddir)/xts5/src/xim/libximtest.a \ + $(top_builddir)/xts5/src/lib/libxtest.a \ + $(top_builddir)/xts5/fonts/libfont.a \ + $(top_builddir)/src/tet3/apilib/libapi.la \ + $(XTS_LIBS) testprogdir = $(libexecdir)/$(subdir) nobase_testprog_PROGRAMS = $(tprogs) diff --git a/xts5/Xlib14/Makefile.am b/xts5/Xlib14/Makefile.am index 98595960..aa9c6f99 100644 --- a/xts5/Xlib14/Makefile.am +++ b/xts5/Xlib14/Makefile.am @@ -1,9 +1,17 @@ include ../common.mk AUTOMAKE_OPTIONS = subdir-objects -AM_CFLAGS = $(XTS_LCFLAGS) $(XTS_CFLAGS) -LDADD = $(TCM) $(XTS_LLIBS) $(XTS_LIBS) \ - $(top_builddir)/xts5/src/libXR5/libXR5.a +AM_CFLAGS = -I$(top_srcdir)/include \ + -I$(top_srcdir)/src/tet3/inc \ + -I$(top_srcdir)/xts5/include \ + $(XTS_CFLAGS) +LDADD = $(top_builddir)/src/tet3/tcm/libtcmmain.la \ + $(top_builddir)/xts5/src/xim/libximtest.a \ + $(top_builddir)/xts5/src/lib/libxtest.a \ + $(top_builddir)/xts5/fonts/libfont.a \ + $(top_builddir)/src/tet3/apilib/libapi.la \ + $(top_builddir)/xts5/src/libXR5/libXR5.a \ + $(XTS_LIBS) testprogdir = $(libexecdir)/$(subdir) nobase_testprog_PROGRAMS = $(tprogs) diff --git a/xts5/Xlib15/Makefile.am b/xts5/Xlib15/Makefile.am index e8105a80..076d9570 100644 --- a/xts5/Xlib15/Makefile.am +++ b/xts5/Xlib15/Makefile.am @@ -1,8 +1,16 @@ include ../common.mk AUTOMAKE_OPTIONS = subdir-objects -AM_CFLAGS = $(XTS_LCFLAGS) $(XTS_CFLAGS) -LDADD = $(TCM) $(XTS_LLIBS) $(XTS_LIBS) +AM_CFLAGS = -I$(top_srcdir)/include \ + -I$(top_srcdir)/src/tet3/inc \ + -I$(top_srcdir)/xts5/include \ + $(XTS_CFLAGS) +LDADD = $(top_builddir)/src/tet3/tcm/libtcmmain.la \ + $(top_builddir)/xts5/src/xim/libximtest.a \ + $(top_builddir)/xts5/src/lib/libxtest.a \ + $(top_builddir)/xts5/fonts/libfont.a \ + $(top_builddir)/src/tet3/apilib/libapi.la \ + $(XTS_LIBS) testprogdir = $(libexecdir)/$(subdir) nobase_testprog_PROGRAMS = $(tprogs) @@ -59,8 +67,14 @@ tprogs = \ XWithdrawWindow # Auxiliary programs run from tests +CHILD_LDADD = $(top_builddir)/src/tet3/tcm/libtcmchild.la \ + $(top_builddir)/xts5/src/xim/libximtest.a \ + $(top_builddir)/xts5/src/lib/libxtest.a \ + $(top_builddir)/xts5/fonts/libfont.a \ + $(top_builddir)/src/tet3/apilib/libapi.la \ + $(XTS_LIBS) nobase_testprog_PROGRAMS += \ XSetWMProperties/Test1 \ XSetWMProperties/Test2 -XSetWMProperties_Test1_LDADD = $(TCMCHILD) $(XTS_LLIBS) $(XTS_LIBS) -XSetWMProperties_Test2_LDADD = $(TCMCHILD) $(XTS_LLIBS) $(XTS_LIBS) +XSetWMProperties_Test1_LDADD = $(CHILD_LDADD) +XSetWMProperties_Test2_LDADD = $(CHILD_LDADD) diff --git a/xts5/Xlib15/XSetWMProperties/XSetWMProperties.m b/xts5/Xlib15/XSetWMProperties/XSetWMProperties.m index 298b408c..2b5751ee 100644 --- a/xts5/Xlib15/XSetWMProperties/XSetWMProperties.m +++ b/xts5/Xlib15/XSetWMProperties/XSetWMProperties.m @@ -131,11 +131,11 @@ AUXCLEAN=Test1.o Test1 Test2.o Test2 all: Test -Test1 : Test1.o $(LIBS) $(TCMCHILD) - $(CC) $(LDFLAGS) -o $@ Test1.o $(TCMCHILD) $(LIBLOCAL) $(LIBS) $(SYSLIBS) +Test1 : Test1.o $(LIBS) $(top_builddir)/src/tet3/tcm/libtcmchild.la + $(CC) $(LDFLAGS) -o $@ Test1.o $(top_builddir)/src/tet3/tcm/libtcmchild.la $(LIBLOCAL) $(LIBS) $(SYSLIBS) -Test2 : Test2.o $(LIBS) $(TCMCHILD) - $(CC) $(LDFLAGS) -o $@ Test2.o $(TCMCHILD) $(LIBLOCAL) $(LIBS) $(SYSLIBS) +Test2 : Test2.o $(LIBS) $(top_builddir)/src/tet3/tcm/libtcmchild.la + $(CC) $(LDFLAGS) -o $@ Test2.o $(top_builddir)/src/tet3/tcm/libtcmchild.la $(LIBLOCAL) $(LIBS) $(SYSLIBS) # # End of section copied from the .m file. diff --git a/xts5/Xlib16/Makefile.am b/xts5/Xlib16/Makefile.am index 331ca5ca..994299c1 100644 --- a/xts5/Xlib16/Makefile.am +++ b/xts5/Xlib16/Makefile.am @@ -1,8 +1,16 @@ include ../common.mk AUTOMAKE_OPTIONS = subdir-objects -AM_CFLAGS = $(XTS_LCFLAGS) $(XTS_CFLAGS) -LDADD = $(TCM) $(XTS_LLIBS) $(XTS_LIBS) +AM_CFLAGS = -I$(top_srcdir)/include \ + -I$(top_srcdir)/src/tet3/inc \ + -I$(top_srcdir)/xts5/include \ + $(XTS_CFLAGS) +LDADD = $(top_builddir)/src/tet3/tcm/libtcmmain.la \ + $(top_builddir)/xts5/src/xim/libximtest.a \ + $(top_builddir)/xts5/src/lib/libxtest.a \ + $(top_builddir)/xts5/fonts/libfont.a \ + $(top_builddir)/src/tet3/apilib/libapi.la \ + $(XTS_LIBS) testprogdir = $(libexecdir)/$(subdir) nobase_testprog_PROGRAMS = $(tprogs) diff --git a/xts5/Xlib17/Makefile.am b/xts5/Xlib17/Makefile.am index 36b64c71..7c722025 100644 --- a/xts5/Xlib17/Makefile.am +++ b/xts5/Xlib17/Makefile.am @@ -1,8 +1,16 @@ include ../common.mk AUTOMAKE_OPTIONS = subdir-objects -AM_CFLAGS = $(XTS_LCFLAGS) $(XTS_CFLAGS) -LDADD = $(TCM) $(XTS_LLIBS) $(XTS_LIBS) +AM_CFLAGS = -I$(top_srcdir)/include \ + -I$(top_srcdir)/src/tet3/inc \ + -I$(top_srcdir)/xts5/include \ + $(XTS_CFLAGS) +LDADD = $(top_builddir)/src/tet3/tcm/libtcmmain.la \ + $(top_builddir)/xts5/src/xim/libximtest.a \ + $(top_builddir)/xts5/src/lib/libxtest.a \ + $(top_builddir)/xts5/fonts/libfont.a \ + $(top_builddir)/src/tet3/apilib/libapi.la \ + $(XTS_LIBS) testprogdir = $(libexecdir)/$(subdir) nobase_testprog_PROGRAMS = $(tprogs) @@ -67,10 +75,16 @@ tprogs = \ XXorRegion # Auxiliary programs run from tests +CHILD_LDADD = $(top_builddir)/src/tet3/tcm/libtcmchild.la \ + $(top_builddir)/xts5/src/xim/libximtest.a \ + $(top_builddir)/xts5/src/lib/libxtest.a \ + $(top_builddir)/xts5/fonts/libfont.a \ + $(top_builddir)/src/tet3/apilib/libapi.la \ + $(XTS_LIBS) nobase_testprog_PROGRAMS += \ XGetDefault/Test3 \ XGetDefault/Test4 \ XGetDefault/Test5 -XGetDefault_Test3_LDADD = $(TCMCHILD) $(XTS_LLIBS) $(XTS_LIBS) -XGetDefault_Test4_LDADD = $(TCMCHILD) $(XTS_LLIBS) $(XTS_LIBS) -XGetDefault_Test5_LDADD = $(TCMCHILD) $(XTS_LLIBS) $(XTS_LIBS) +XGetDefault_Test3_LDADD = $(CHILD_LDADD) +XGetDefault_Test4_LDADD = $(CHILD_LDADD) +XGetDefault_Test5_LDADD = $(CHILD_LDADD) diff --git a/xts5/Xlib17/XGetDefault/XGetDefault.m b/xts5/Xlib17/XGetDefault/XGetDefault.m index fbd53f09..1a4abf4c 100644 --- a/xts5/Xlib17/XGetDefault/XGetDefault.m +++ b/xts5/Xlib17/XGetDefault/XGetDefault.m @@ -124,14 +124,14 @@ all: Test $(CP) Xdefaults .Xdefaults $(CP) HstXdefaults ./.Xdefaults-$(XTESTHOST) -Test3 : Test3.o $(LIBS) $(TCMCHILD) - $(CC) $(LDFLAGS) -o $@ Test3.o $(TCMCHILD) $(LIBLOCAL) $(LIBS) $(SYSLIBS) +Test3 : Test3.o $(LIBS) $(top_builddir)/src/tet3/tcm/libtcmchild.la + $(CC) $(LDFLAGS) -o $@ Test3.o $(top_builddir)/src/tet3/tcm/libtcmchild.la $(LIBLOCAL) $(LIBS) $(SYSLIBS) -Test4 : Test4.o $(LIBS) $(TCMCHILD) - $(CC) $(LDFLAGS) -o $@ Test4.o $(TCMCHILD) $(LIBLOCAL) $(LIBS) $(SYSLIBS) +Test4 : Test4.o $(LIBS) $(top_builddir)/src/tet3/tcm/libtcmchild.la + $(CC) $(LDFLAGS) -o $@ Test4.o $(top_builddir)/src/tet3/tcm/libtcmchild.la $(LIBLOCAL) $(LIBS) $(SYSLIBS) -Test5 : Test5.o $(LIBS) $(TCMCHILD) - $(CC) $(LDFLAGS) -o $@ Test5.o $(TCMCHILD) $(LIBLOCAL) $(LIBS) $(SYSLIBS) +Test5 : Test5.o $(LIBS) $(top_builddir)/src/tet3/tcm/libtcmchild.la + $(CC) $(LDFLAGS) -o $@ Test5.o $(top_builddir)/src/tet3/tcm/libtcmchild.la $(LIBLOCAL) $(LIBS) $(SYSLIBS) >># end of included makefile section >>EXTERN diff --git a/xts5/Xlib3/Makefile.am b/xts5/Xlib3/Makefile.am index e1342b1e..80f92e1f 100644 --- a/xts5/Xlib3/Makefile.am +++ b/xts5/Xlib3/Makefile.am @@ -1,8 +1,16 @@ include ../common.mk AUTOMAKE_OPTIONS = subdir-objects -AM_CFLAGS = $(XTS_LCFLAGS) $(XTS_CFLAGS) -LDADD = $(TCM) $(XTS_LLIBS) $(XTS_LIBS) +AM_CFLAGS = -I$(top_srcdir)/include \ + -I$(top_srcdir)/src/tet3/inc \ + -I$(top_srcdir)/xts5/include \ + $(XTS_CFLAGS) +LDADD = $(top_builddir)/src/tet3/tcm/libtcmmain.la \ + $(top_builddir)/xts5/src/xim/libximtest.a \ + $(top_builddir)/xts5/src/lib/libxtest.a \ + $(top_builddir)/xts5/fonts/libfont.a \ + $(top_builddir)/src/tet3/apilib/libapi.la \ + $(XTS_LIBS) testprogdir = $(libexecdir)/$(subdir) nobase_testprog_PROGRAMS = $(tprogs) @@ -71,8 +79,14 @@ tprogs = XAllPlanes \ XWhitePixelOfScreen XWhitePixelOfScreen_m # Auxiliary programs run from tests +CHILD_LDADD = $(top_builddir)/src/tet3/tcm/libtcmchild.la \ + $(top_builddir)/xts5/src/xim/libximtest.a \ + $(top_builddir)/xts5/src/lib/libxtest.a \ + $(top_builddir)/xts5/fonts/libfont.a \ + $(top_builddir)/src/tet3/apilib/libapi.la \ + $(XTS_LIBS) nobase_testprog_PROGRAMS += \ XDisplayString/Test1 \ XOpenDisplay/Test1 -XDisplayString_Test1_LDADD = $(TCMCHILD) $(XTS_LLIBS) $(XTS_LIBS) -XOpenDisplay_Test1_LDADD = $(TCMCHILD) $(XTS_LLIBS) $(XTS_LIBS) +XDisplayString_Test1_LDADD = $(CHILD_LDADD) +XOpenDisplay_Test1_LDADD = $(CHILD_LDADD) diff --git a/xts5/Xlib3/XDisplayString/XDisplayString.m b/xts5/Xlib3/XDisplayString/XDisplayString.m index ded5e340..79c7ed29 100644 --- a/xts5/Xlib3/XDisplayString/XDisplayString.m +++ b/xts5/Xlib3/XDisplayString/XDisplayString.m @@ -122,8 +122,8 @@ AUXCLEAN=Test1.o Test1 all: Test -Test1 : Test1.o $(LIBS) $(TCMCHILD) - $(CC) $(LDFLAGS) -o $@ Test1.o $(TCMCHILD) $(LIBLOCAL) $(LIBS) $(SYSLIBS) +Test1 : Test1.o $(LIBS) $(top_builddir)/src/tet3/tcm/libtcmchild.la + $(CC) $(LDFLAGS) -o $@ Test1.o $(top_builddir)/src/tet3/tcm/libtcmchild.la $(LIBLOCAL) $(LIBS) $(SYSLIBS) # # End of section copied from the .m file. diff --git a/xts5/Xlib3/XOpenDisplay/XOpenDisplay.m b/xts5/Xlib3/XOpenDisplay/XOpenDisplay.m index 09b783d3..64ec7ba8 100644 --- a/xts5/Xlib3/XOpenDisplay/XOpenDisplay.m +++ b/xts5/Xlib3/XOpenDisplay/XOpenDisplay.m @@ -124,8 +124,8 @@ AUXCLEAN=Test1.o Test1 all: Test -Test1 : Test1.o $(LIBS) $(TCMCHILD) - $(CC) $(LDFLAGS) -o $@ Test1.o $(TCMCHILD) $(LIBLOCAL) $(LIBS) $(SYSLIBS) +Test1 : Test1.o $(LIBS) $(top_builddir)/src/tet3/tcm/libtcmchild.la + $(CC) $(LDFLAGS) -o $@ Test1.o $(top_builddir)/src/tet3/tcm/libtcmchild.la $(LIBLOCAL) $(LIBS) $(SYSLIBS) # # End of section copied from the .m file. diff --git a/xts5/Xlib4/Makefile.am b/xts5/Xlib4/Makefile.am index 945961d3..fdcc5bc1 100644 --- a/xts5/Xlib4/Makefile.am +++ b/xts5/Xlib4/Makefile.am @@ -1,8 +1,16 @@ include ../common.mk AUTOMAKE_OPTIONS = subdir-objects -AM_CFLAGS = $(XTS_LCFLAGS) $(XTS_CFLAGS) -LDADD = $(TCM) $(XTS_LLIBS) $(XTS_LIBS) +AM_CFLAGS = -I$(top_srcdir)/include \ + -I$(top_srcdir)/src/tet3/inc \ + -I$(top_srcdir)/xts5/include \ + $(XTS_CFLAGS) +LDADD = $(top_builddir)/src/tet3/tcm/libtcmmain.la \ + $(top_builddir)/xts5/src/xim/libximtest.a \ + $(top_builddir)/xts5/src/lib/libxtest.a \ + $(top_builddir)/xts5/fonts/libfont.a \ + $(top_builddir)/src/tet3/apilib/libapi.la \ + $(XTS_LIBS) testprogdir = $(libexecdir)/$(subdir) nobase_testprog_PROGRAMS = $(tprogs) diff --git a/xts5/Xlib5/Makefile.am b/xts5/Xlib5/Makefile.am index 707b58d4..b8caa74d 100644 --- a/xts5/Xlib5/Makefile.am +++ b/xts5/Xlib5/Makefile.am @@ -1,8 +1,16 @@ include ../common.mk AUTOMAKE_OPTIONS = subdir-objects -AM_CFLAGS = $(XTS_LCFLAGS) $(XTS_CFLAGS) -LDADD = $(TCM) $(XTS_LLIBS) $(XTS_LIBS) +AM_CFLAGS = -I$(top_srcdir)/include \ + -I$(top_srcdir)/src/tet3/inc \ + -I$(top_srcdir)/xts5/include \ + $(XTS_CFLAGS) +LDADD = $(top_builddir)/src/tet3/tcm/libtcmmain.la \ + $(top_builddir)/xts5/src/xim/libximtest.a \ + $(top_builddir)/xts5/src/lib/libxtest.a \ + $(top_builddir)/xts5/fonts/libfont.a \ + $(top_builddir)/src/tet3/apilib/libapi.la \ + $(XTS_LIBS) testprogdir = $(libexecdir)/$(subdir) nobase_testprog_PROGRAMS = $(tprogs) diff --git a/xts5/Xlib6/Makefile.am b/xts5/Xlib6/Makefile.am index b561b419..824844bf 100644 --- a/xts5/Xlib6/Makefile.am +++ b/xts5/Xlib6/Makefile.am @@ -1,8 +1,16 @@ include ../common.mk AUTOMAKE_OPTIONS = subdir-objects -AM_CFLAGS = $(XTS_LCFLAGS) $(XTS_CFLAGS) -LDADD = $(TCM) $(XTS_LLIBS) $(XTS_LIBS) +AM_CFLAGS = -I$(top_srcdir)/include \ + -I$(top_srcdir)/src/tet3/inc \ + -I$(top_srcdir)/xts5/include \ + $(XTS_CFLAGS) +LDADD = $(top_builddir)/src/tet3/tcm/libtcmmain.la \ + $(top_builddir)/xts5/src/xim/libximtest.a \ + $(top_builddir)/xts5/src/lib/libxtest.a \ + $(top_builddir)/xts5/fonts/libfont.a \ + $(top_builddir)/src/tet3/apilib/libapi.la \ + $(XTS_LIBS) testprogdir = $(libexecdir)/$(subdir) nobase_testprog_PROGRAMS = $(tprogs) diff --git a/xts5/Xlib7/Makefile.am b/xts5/Xlib7/Makefile.am index 583094a6..630450dd 100644 --- a/xts5/Xlib7/Makefile.am +++ b/xts5/Xlib7/Makefile.am @@ -1,9 +1,17 @@ include ../common.mk AUTOMAKE_OPTIONS = subdir-objects -AM_CFLAGS = $(XTS_LCFLAGS) $(XTS_CFLAGS) -LDADD = $(TCM) $(XTS_LLIBS) $(XTS_LIBS) \ - $(top_builddir)/xts5/src/libXR5/libXR5.a +AM_CFLAGS = -I$(top_srcdir)/include \ + -I$(top_srcdir)/src/tet3/inc \ + -I$(top_srcdir)/xts5/include \ + $(XTS_CFLAGS) +LDADD = $(top_builddir)/src/tet3/tcm/libtcmmain.la \ + $(top_builddir)/xts5/src/xim/libximtest.a \ + $(top_builddir)/xts5/src/lib/libxtest.a \ + $(top_builddir)/xts5/fonts/libfont.a \ + $(top_builddir)/src/tet3/apilib/libapi.la \ + $(top_builddir)/xts5/src/libXR5/libXR5.a \ + $(XTS_LIBS) testprogdir = $(libexecdir)/$(subdir) nobase_testprog_PROGRAMS = $(tprogs) diff --git a/xts5/Xlib8/Makefile.am b/xts5/Xlib8/Makefile.am index 36fb4cde..4439e7a7 100644 --- a/xts5/Xlib8/Makefile.am +++ b/xts5/Xlib8/Makefile.am @@ -1,16 +1,23 @@ include ../common.mk AUTOMAKE_OPTIONS = subdir-objects -AM_CFLAGS = $(XTS_LCFLAGS) $(XTS_CFLAGS) -LDADD = $(TCM) $(XTS_LLIBS) $(XTS_LIBS) +AM_CFLAGS = -I$(top_srcdir)/include \ + -I$(top_srcdir)/src/tet3/inc \ + -I$(top_srcdir)/xts5/include \ + $(XTS_CFLAGS) +LDADD = $(top_builddir)/src/tet3/tcm/libtcmmain.la \ + $(top_builddir)/xts5/src/xim/libximtest.a \ + $(top_builddir)/xts5/src/lib/libxtest.a \ + $(top_builddir)/xts5/fonts/libfont.a \ + $(top_builddir)/src/tet3/apilib/libapi.la \ + $(XTS_LIBS) testprogdir = $(libexecdir)/$(subdir) nobase_testprog_PROGRAMS = $(tprogs) BUILT_SOURCES = $(tprogs:$(EXEEXT)=.c) CLEANFILES = $(BUILT_SOURCES) -XFlushGC_LDADD = $(TCM) $(XTS_LLIBS) $(XTS_LIBS) \ - $(top_builddir)/xts5/src/libXR5/libXR5.a +XFlushGC_LDADD = $(LDADD) $(top_builddir)/xts5/src/libXR5/libXR5.a tprogs = \ XChangeGC \ diff --git a/xts5/Xlib9/Makefile.am b/xts5/Xlib9/Makefile.am index 5a5936ef..f33c4401 100644 --- a/xts5/Xlib9/Makefile.am +++ b/xts5/Xlib9/Makefile.am @@ -1,8 +1,16 @@ include ../common.mk AUTOMAKE_OPTIONS = subdir-objects -AM_CFLAGS = $(XTS_LCFLAGS) $(XTS_CFLAGS) -LDADD = $(TCM) $(XTS_LLIBS) $(XTS_LIBS) +AM_CFLAGS = -I$(top_srcdir)/include \ + -I$(top_srcdir)/src/tet3/inc \ + -I$(top_srcdir)/xts5/include \ + $(XTS_CFLAGS) +LDADD = $(top_builddir)/src/tet3/tcm/libtcmmain.la \ + $(top_builddir)/xts5/src/xim/libximtest.a \ + $(top_builddir)/xts5/src/lib/libxtest.a \ + $(top_builddir)/xts5/fonts/libfont.a \ + $(top_builddir)/src/tet3/apilib/libapi.la \ + $(XTS_LIBS) testprogdir = $(libexecdir)/$(subdir) nobase_testprog_PROGRAMS = $(tprogs) diff --git a/xts5/Xopen/Makefile.am b/xts5/Xopen/Makefile.am index 5cd03c1b..c82cd869 100644 --- a/xts5/Xopen/Makefile.am +++ b/xts5/Xopen/Makefile.am @@ -1,8 +1,16 @@ include ../common.mk AUTOMAKE_OPTIONS = subdir-objects -AM_CFLAGS = $(XTS_LCFLAGS) $(XTS_CFLAGS) -LDADD = $(TCM) $(XTS_LLIBS) $(XTS_LIBS) +AM_CFLAGS = -I$(top_srcdir)/include \ + -I$(top_srcdir)/src/tet3/inc \ + -I$(top_srcdir)/xts5/include \ + $(XTS_CFLAGS) +LDADD = $(top_builddir)/src/tet3/tcm/libtcmmain.la \ + $(top_builddir)/xts5/src/xim/libximtest.a \ + $(top_builddir)/xts5/src/lib/libxtest.a \ + $(top_builddir)/xts5/fonts/libfont.a \ + $(top_builddir)/src/tet3/apilib/libapi.la \ + $(XTS_LIBS) testprogdir = $(libexecdir)/$(subdir) nobase_testprog_PROGRAMS = $(tprogs) diff --git a/xts5/Xproto/Makefile.am b/xts5/Xproto/Makefile.am index acfb465b..0ad4b8d0 100644 --- a/xts5/Xproto/Makefile.am +++ b/xts5/Xproto/Makefile.am @@ -1,8 +1,16 @@ include ../common.mk AUTOMAKE_OPTIONS = subdir-objects -AM_CFLAGS = $(XP_LCFLAGS) $(XP_CFLAGS) -LDADD = $(TCM) $(XP_LLIBS) $(XP_LIBS) +AM_CFLAGS = -I$(top_srcdir)/include \ + -I$(top_srcdir)/src/tet3/inc \ + -I$(top_srcdir)/xts5/include \ + $(XP_CFLAGS) +LDADD = $(top_builddir)/src/tet3/tcm/libtcmmain.la \ + $(top_builddir)/xts5/src/libproto/libXst.a \ + $(top_builddir)/xts5/src/lib/libxtest.a \ + $(top_builddir)/xts5/fonts/libfont.a \ + $(top_builddir)/src/tet3/apilib/libapi.la \ + $(XP_LIBS) testprogdir = $(libexecdir)/$(subdir) nobase_testprog_PROGRAMS = $(tprogs) diff --git a/xts5/common.mk b/xts5/common.mk index fd929ffd..61574d92 100644 --- a/xts5/common.mk +++ b/xts5/common.mk @@ -11,33 +11,9 @@ AM_V_mc = $(AM_V_mc_$(V)) AM_V_mc_ = $(AM_V_mc_$(AM_DEFAULT_VERBOSITY)) AM_V_mc_0 = @echo " MC " $@; .m.c: - $(AM_V_mc)TET_ROOT='$(TET_ROOT)' $(MC) -o $@ $< + $(AM_V_mc)TET_ROOT='$(abs_top_srcdir)' $(MC) -o $@ $< .m_m.c: - $(AM_V_mc)TET_ROOT='$(TET_ROOT)' $(MC) -m -o $@ $< - -################## -# TET locations -################## - -# The location of TET_ROOT. This must not contain variable expansions. -# This must be set in the environment -TET_ROOT = $(abs_top_srcdir) - -# The location of the TET directories -TETSRC = $(top_srcdir)/src/tet3 -TETBUILD = $(top_builddir)/src/tet3 - -# TETINCDIR - The directory containing the TET API headers. -TETINCDIR = $(TETSRC)/inc - -# TCM - The Test Control Manager -TCM = $(TETBUILD)/tcm/libtcmmain.la - -# TCMCHILD - The Test Control Manager for files executed by tet_exec. -TCMCHILD = $(TETBUILD)/tcm/libtcmchild.la - -# APILIB - The TET API library -APILIB = $(TETSRC)/apilib/libapi.la + $(AM_V_mc)TET_ROOT='$(abs_top_srcdir)' $(MC) -m -o $@ $< #################### # Xtest variables @@ -58,95 +34,14 @@ APILIB = $(TETSRC)/apilib/libapi.la # SVR4 : XTESTHOST=`uname -n` XTESTHOST = `hostname` -# XTESTFONTDIR - location of installed VSW5 compiled fonts -XTESTFONTDIR = $(TET_ROOT)/xts5/fonts - -# XTESTSRC -XTESTSRC = $(top_srcdir)/xts5 -XTESTBUILD = $(top_builddir)/xts5 - -# XTTESTLIB - the Xt Tests' libraries -XTTESTLIB = $(XTESTBUILD)/src/libXtTest/libXtTest.a - -# XTESTLIB - the VSW5 library -XTESTLIB = $(XTESTBUILD)/src/lib/libxtest.a - -# XSTLIB - library for linking the X Protocol tests -XSTLIB = $(XTESTBUILD)/src/libproto/libXst.a - -# XTESTFONTLIB - supplementary library with font metrics. -XTESTFONTLIB = $(XTESTBUILD)/fonts/libfont.a - -# XTESTXIMLIB - supplementary library for input methods. -XTESTXIMLIB = $(XTESTBUILD)/src/xim/libximtest.a - -# XTESTINCDIR - the VSW5 header file directory -XTESTINCDIR = $(XTESTSRC)/include - -################################ -##### C compiler Directives Section -################################ - -# XP_OPEN_DIS - A choice of which code to build in the X Protocol library -# to make an X server connection. -# This must be set to one of three possible values: -# -# XlibXtst.c Your Xlib includes enhancements to _XConnectDisplay -# ensuring maximum portable protocol test coverage. -# XlibOpaque.c You have a normal R4 Xlib or early R5 Xlib which you -# cannot patch to include the enhancements to -# _XConnectDisplay, and you cannot emulate these by -# building XlibNoXtst.c, so only client-native testing -# can be done portably, and no failure testing of -# XOpenDisplay can be done. -# This option uses XOpenDisplay to make the connection, -# from which the file descriptor is recovered for -# our own use. XCloseDisplay shuts down the connection. -# XlibNoXtst.c As for XlibOpaque.c but you can use the R4/R5 -# connection emulation supplied. (Note: R4/R5 independent) -# This will ensure maximum protocol test coverage -# but may not be portable to all platforms. -# -# Reasons for not being able to build XlibNoXtst.c might include: -# i) different interfaces to connection setup and connection read/write; -# ii) different access control mechanisms. -# Refer to your Xlib documentation for further details. -# -XP_OPEN_DIS=XlibXtst.c -#XP_OPEN_DIS=XlibNoXtst.c -#XP_OPEN_DIS=XlibOpaque.c - -# CFLAGS - Flags for C compiler -# -COMMON_CFLAGS = -I$(top_srcdir)/include -I$(TETINCDIR) -I$(XTESTINCDIR) - -# XTS_LCFLAGS - Flags for C compiler for generic xts5 programs -XTS_LCFLAGS = $(COMMON_CFLAGS) - -# XP_LCFLAGS - Flags for C compiler specific to the X Protocol tests. -XP_LCFLAGS = $(COMMON_CFLAGS) - -# XT_LCFLAGS - Flags for C compiler specific to the Xt Toolkit tests. -XT_LCFLAGS = $(COMMON_CFLAGS) - -# LIBS - List of libraries. -# -# XTS_LLIBS - Libraries for generic xts5 programs -XTS_LLIBS = $(XTESTXIMLIB) $(XTESTLIB) $(XTESTFONTLIB) $(APILIB) - -# XP_LIBS - List of libraries specific to the X Protocol tests. -XP_LLIBS = $(XSTLIB) $(XTESTLIB) $(XTESTFONTLIB) $(APILIB) - -# XT_LIBS - List of libraries specific to the Xt Toolkit tests. -XT_LLIBS = $(XTESTLIB) $(XTTESTLIB) $(APILIB) - ################################ ##### Pixel Validation Section. ################################ PVXTESTLIB = ${XTESTLIBDIR}/libxtstpv.a PIXLIB = ${XTESTLIBDIR}/libpvt.a -PVLIBS = ${PVXTESTLIB} ${XTESTFONTLIB} ${PIXLIB} ${APILIB} +PVLIBS = ${PVXTESTLIB} $(top_builddir)/xts/fonts/libfont.a ${PIXLIB} \ + $(top_builddir)/src/tet3/apilib/libapi.la # SYSMATHLIB - system math library. Directive to be given to the C compiler # to cause the maths routines to be available. diff --git a/xts5/fonts/Makefile.am b/xts5/fonts/Makefile.am index 4305dd92..e8b71d7c 100644 --- a/xts5/fonts/Makefile.am +++ b/xts5/fonts/Makefile.am @@ -1,6 +1,9 @@ include ../common.mk -AM_CFLAGS = $(XTS_LCFLAGS) $(XTS_CFLAGS) +AM_CFLAGS = -I$(top_srcdir)/include \ + -I$(top_srcdir)/src/tet3/inc \ + -I$(top_srcdir)/xts5/include \ + $(XTS_CFLAGS) noinst_LIBRARIES = libfont.a libfont_a_SOURCES = xtfont0.c xtfont1.c xtfont2.c xtfont3.c xtfont4.c \ xtfont5.c xtfont6.c diff --git a/xts5/lib/mc/mmmsa.mc b/xts5/lib/mc/mmmsa.mc index e294bd8b..e1f2a8f5 100644 --- a/xts5/lib/mc/mmmsa.mc +++ b/xts5/lib/mc/mmmsa.mc @@ -2,8 +2,8 @@ # Build a standalone version of the test case using the macro version # of the function. # -MTest: $(MOFILES) $(LIBS) $(TCM) $(AUXFILES) - $(CC) $(LDFLAGS) -o $@ $(MOFILES) $(TCM) $(LIBLOCAL) $(LIBS) $(SYSLIBS) +MTest: $(MOFILES) $(LIBS) $(top_builddir)/src/tet3/tcm/libtcmmain.la $(AUXFILES) + $(CC) $(LDFLAGS) -o $@ $(MOFILES) $(top_builddir)/src/tet3/tcm/libtcmmain.la $(LIBLOCAL) $(LIBS) $(SYSLIBS) MTest.c: $(SOURCES) $(CODEMAKER) -m -o MTest.c $(SOURCES) diff --git a/xts5/lib/mc/mmpgen.mc b/xts5/lib/mc/mmpgen.mc index 9457dbba..e4304619 100644 --- a/xts5/lib/mc/mmpgen.mc +++ b/xts5/lib/mc/mmpgen.mc @@ -5,8 +5,8 @@ PVOFILES=pvtest.o -pvgen: $(PVOFILES) $(PVLIBS) $(TCM) - $(CC) $(LDFLAGS) -o $@ $(PVOFILES) $(TCM) \ +pvgen: $(PVOFILES) $(PVLIBS) $(top_builddir)/src/tet3/tcm/libtcmmain.la + $(CC) $(LDFLAGS) -o $@ $(PVOFILES) $(top_builddir)/src/tet3/tcm/libtcmmain.la \ $(PVLIBS) $(SYSLIBS) $(SYSMATHLIB) pvtest.o: pvtest.c diff --git a/xts5/lib/mc/mmsa.mc b/xts5/lib/mc/mmsa.mc index d40362cd..1b2467bd 100644 --- a/xts5/lib/mc/mmsa.mc +++ b/xts5/lib/mc/mmsa.mc @@ -1,8 +1,8 @@ # # Build a standalone version of the test case. # -Test: $(OFILES) $(LIBS) $(TCM) $(AUXFILES) - $(CC) $(LDFLAGS) -o $@ $(OFILES) $(TCM) $(LIBLOCAL) $(LIBS) $(SYSLIBS) +Test: $(OFILES) $(LIBS) $(top_builddir)/src/tet3/tcm/libtcmmain.la $(AUXFILES) + $(CC) $(LDFLAGS) -o $@ $(OFILES) $(top_builddir)/src/tet3/tcm/libtcmmain.la $(LIBLOCAL) $(LIBS) $(SYSLIBS) Test.c: $(SOURCES) $(CODEMAKER) -o Test.c $(SOURCES) diff --git a/xts5/lib/mc/mmxcmssa.mc b/xts5/lib/mc/mmxcmssa.mc index 0da6e657..118cd8fa 100644 --- a/xts5/lib/mc/mmxcmssa.mc +++ b/xts5/lib/mc/mmxcmssa.mc @@ -1,8 +1,8 @@ # # Build a standalone version of the test case. # -Test: $(OFILES) $(LIBS) ${XTESTLIBDIR}/libXR5.a $(TCM) $(AUXFILES) - $(CC) $(LDFLAGS) -o $@ $(OFILES) $(TCM) $(LIBLOCAL) ${XTESTLIBDIR}/libXR5.a $(LIBS) $(SYSLIBS) +Test: $(OFILES) $(LIBS) ${XTESTLIBDIR}/libXR5.a $(top_builddir)/src/tet3/tcm/libtcmmain.la $(AUXFILES) + $(CC) $(LDFLAGS) -o $@ $(OFILES) $(top_builddir)/src/tet3/tcm/libtcmmain.la $(LIBLOCAL) ${XTESTLIBDIR}/libXR5.a $(LIBS) $(SYSLIBS) Test.c: $(SOURCES) $(CODEMAKER) -o Test.c $(SOURCES) diff --git a/xts5/lib/mc/mmxtsa.mc b/xts5/lib/mc/mmxtsa.mc index 5525f61d..c050d154 100644 --- a/xts5/lib/mc/mmxtsa.mc +++ b/xts5/lib/mc/mmxtsa.mc @@ -1,8 +1,8 @@ # # Build a standalone version of the test case. # -Test: $(OFILES) $(XT_LIBS) $(TCM) $(AUXFILES) - $(CC) $(LDFLAGS) -o $@ $(OFILES) $(TCM) $(LIBLOCAL) $(XT_LIBS) $(XT_SYSLIBS) +Test: $(OFILES) $(XT_LIBS) $(top_builddir)/src/tet3/tcm/libtcmmain.la $(AUXFILES) + $(CC) $(LDFLAGS) -o $@ $(OFILES) $(top_builddir)/src/tet3/tcm/libtcmmain.la $(LIBLOCAL) $(XT_LIBS) $(XT_SYSLIBS) Test.c: $(SOURCES) $(CODEMAKER) -o Test.c $(SOURCES) diff --git a/xts5/lib/mc/mmxtsaa.mc b/xts5/lib/mc/mmxtsaa.mc index 60e55277..98a563d5 100644 --- a/xts5/lib/mc/mmxtsaa.mc +++ b/xts5/lib/mc/mmxtsaa.mc @@ -1,8 +1,8 @@ # # Build a standalone version of the test case. # -Test: $(OFILES) $(XT_LIBS) $(TCM) $(AUXFILES) - $(CC) $(LDFLAGS) -o $@ $(OFILES) $(TCM) $(LIBLOCAL) $(XT_LIBS) $(XT_ATHENA) $(XT_SYSLIBS) +Test: $(OFILES) $(XT_LIBS) $(top_builddir)/src/tet3/tcm/libtcmmain.la $(AUXFILES) + $(CC) $(LDFLAGS) -o $@ $(OFILES) $(top_builddir)/src/tet3/tcm/libtcmmain.la $(LIBLOCAL) $(XT_LIBS) $(XT_ATHENA) $(XT_SYSLIBS) Test.c: $(SOURCES) $(CODEMAKER) -o Test.c $(SOURCES) diff --git a/xts5/src/bin/mc/Makefile.am b/xts5/src/bin/mc/Makefile.am index db2cd43d..a83f80a1 100644 --- a/xts5/src/bin/mc/Makefile.am +++ b/xts5/src/bin/mc/Makefile.am @@ -1,6 +1,8 @@ include ../../../common.mk -AM_CFLAGS = $(COMMON_CFLAGS) +AM_CFLAGS = -I$(top_srcdir)/include \ + -I$(top_srcdir)/src/tet3/inc \ + -I$(top_srcdir)/xts5/include noinst_PROGRAMS = mc mc_SOURCES = main.c sections.c files.c shortname.c error.c gccomps.c set.c \ expand.c code.c make.c ma.c cond.c mas.c diff --git a/xts5/src/lib/Makefile.am b/xts5/src/lib/Makefile.am index a8d478a2..9b0dff7d 100644 --- a/xts5/src/lib/Makefile.am +++ b/xts5/src/lib/Makefile.am @@ -1,6 +1,9 @@ include ../../common.mk -AM_CFLAGS = $(XTS_LCFLAGS) $(XTS_CFLAGS) +AM_CFLAGS = -I$(top_srcdir)/include \ + -I$(top_srcdir)/src/tet3/inc \ + -I$(top_srcdir)/xts5/include \ + $(XTS_CFLAGS) noinst_LIBRARIES = libxtest.a libxtest_a_SOURCES = badcmap.c \ badfont.c\ diff --git a/xts5/src/libXR5/Makefile.am b/xts5/src/libXR5/Makefile.am index 09e21bc9..ff8a3430 100644 --- a/xts5/src/libXR5/Makefile.am +++ b/xts5/src/libXR5/Makefile.am @@ -1,6 +1,10 @@ include ../../common.mk -AM_CFLAGS = $(XTS_LCFLAGS) $(XTS_CFLAGS) -DDEBUG +AM_CFLAGS = -I$(top_srcdir)/include \ + -I$(top_srcdir)/src/tet3/inc \ + -I$(top_srcdir)/xts5/include \ + $(XTS_CFLAGS) \ + -DDEBUG noinst_LIBRARIES = libXR5.a libXR5_a_SOURCES = \ r5startup.c \ diff --git a/xts5/src/libXtTest/Makefile.am b/xts5/src/libXtTest/Makefile.am index 1aa8b617..8f341a17 100644 --- a/xts5/src/libXtTest/Makefile.am +++ b/xts5/src/libXtTest/Makefile.am @@ -1,6 +1,9 @@ include ../../common.mk -AM_CFLAGS = $(XT_LCFLAGS) $(XT_CFLAGS) +AM_CFLAGS = -I$(top_srcdir)/include \ + -I$(top_srcdir)/src/tet3/inc \ + -I$(top_srcdir)/xts5/include \ + $(XT_CFLAGS) noinst_LIBRARIES = libXtTest.a libXtTest_a_SOURCES = avs_def.c \ avs_func.c \ diff --git a/xts5/src/libproto/Makefile.am b/xts5/src/libproto/Makefile.am index c86ae55c..f917b3fb 100644 --- a/xts5/src/libproto/Makefile.am +++ b/xts5/src/libproto/Makefile.am @@ -1,6 +1,38 @@ include ../../common.mk -AM_CFLAGS = $(XP_LCFLAGS) $(XP_CFLAGS) +# XP_OPEN_DIS - A choice of which code to build in the X Protocol library +# to make an X server connection. +# This must be set to one of three possible values: +# +# XlibXtst.c Your Xlib includes enhancements to _XConnectDisplay +# ensuring maximum portable protocol test coverage. +# XlibOpaque.c You have a normal R4 Xlib or early R5 Xlib which you +# cannot patch to include the enhancements to +# _XConnectDisplay, and you cannot emulate these by +# building XlibNoXtst.c, so only client-native testing +# can be done portably, and no failure testing of +# XOpenDisplay can be done. +# This option uses XOpenDisplay to make the connection, +# from which the file descriptor is recovered for +# our own use. XCloseDisplay shuts down the connection. +# XlibNoXtst.c As for XlibOpaque.c but you can use the R4/R5 +# connection emulation supplied. (Note: R4/R5 independent) +# This will ensure maximum protocol test coverage +# but may not be portable to all platforms. +# +# Reasons for not being able to build XlibNoXtst.c might include: +# i) different interfaces to connection setup and connection read/write; +# ii) different access control mechanisms. +# Refer to your Xlib documentation for further details. +# +XP_OPEN_DIS=XlibXtst.c +#XP_OPEN_DIS=XlibNoXtst.c +#XP_OPEN_DIS=XlibOpaque.c + +AM_CFLAGS = -I$(top_srcdir)/include \ + -I$(top_srcdir)/src/tet3/inc \ + -I$(top_srcdir)/xts5/include \ + $(XP_CFLAGS) noinst_LIBRARIES = libXst.a libXst_a_SOURCES =\ XstlibInt.h\ diff --git a/xts5/src/xim/Makefile.am b/xts5/src/xim/Makefile.am index 678a041f..2bb4f6fc 100644 --- a/xts5/src/xim/Makefile.am +++ b/xts5/src/xim/Makefile.am @@ -1,6 +1,9 @@ include ../../common.mk -AM_CFLAGS = $(XTS_LCFLAGS) $(XTS_CFLAGS) +AM_CFLAGS = -I$(top_srcdir)/include \ + -I$(top_srcdir)/src/tet3/inc \ + -I$(top_srcdir)/xts5/include \ + $(XTS_CFLAGS) noinst_LIBRARIES = libximtest.a libximtest_a_SOURCES = \ linklocale.c \ |