autotool

move original Makefiles to makefile.old

21 files changed, 58 insertions, 34 deletions

diff --git a/configure.ac b/configure.ac
index 8de6908b..b5579129 100644
--- a/configure.ac
+++ b/configure.ac
@@ -21,7 +21,7 @@
 # Process this file with autoconf to produce a configure script
 
 AC_PREREQ(2.57)
-AC_INIT([xtest]
+AC_INIT([xtest],
         1.0.0,
         [http://xorg.freedesktop.org/wiki/BuildingXtest],
         XTest)
@@ -38,7 +38,7 @@ AM_CONFIG_HEADER([config.h])
 AC_DISABLE_STATIC
 AC_PROG_LIBTOOL
 AC_PROG_CC
-XORG_CWARNFLAGS
+#AM_PROG_CC_C_O
 
 PKG_CHECK_MODULES(XORG, x11 xproto)
 
@@ -47,4 +47,12 @@ AC_HEADER_STDC
 
 AC_OUTPUT([Makefile
            src/Makefile
+           src/tet3/Makefile
+           src/tet3/apilib/Makefile
+           src/tet3/dtet2lib/Makefile
+           src/tet3/inetlib/Makefile
+           src/tet3/servlib/Makefile
+           src/tet3/tcm/Makefile
+           src/tet3/tcc/Makefile
+           src/tet3/tcclib/Makefile
            xts5/Makefile])
diff --git a/makefile.old b/makefile.old
new file mode 100644
index 00000000..8725c1af
--- /dev/null
+++ b/makefile.old
@@ -0,0 +1,5 @@
+all:
+	mkdir bin lib lib/ksh lib/perl lib/tet3 lib/xpg3sh || true
+	sh configure -t lite
+	make -C src all install
+	make -C xts5
diff --git a/src/makefile b/src/makefile.old
index 34944e57..34944e57 100644
--- a/src/makefile
+++ b/src/makefile.old
diff --git a/src/tet3/Makefile.am b/src/tet3/Makefile.am
index 3eb8cd5c..68f46652 100644
--- a/src/tet3/Makefile.am
+++ b/src/tet3/Makefile.am
@@ -1,4 +1,2 @@
 SUBDIRS = tcm tcclib apilib dtet2lib tcclib tcc 
-CFLAGS = -DTET_LITE
 
-#tcmthr apithr apishlib tcmshlib apithrshlib tcmthrshlib
diff --git a/src/tet3/apilib/Makefile.am b/src/tet3/apilib/Makefile.am
index abb5575b..c3cfff73 100644
--- a/src/tet3/apilib/Makefile.am
+++ b/src/tet3/apilib/Makefile.am
@@ -1,8 +1,8 @@
+AM_CPPFLAGS=-DTET_LITE
 noinst_LIBRARIES = libapi.a
 libapi_adir = $(top_srcdir)/lib
 libapi_a_CFLAGS = -I ../inc -I $(top_srcdir)/include
 libapi_a_SOURCES = \
-		dcancel.c \
 		dconfig.c \
 		dresfile.c \
 		errno.c \
@@ -22,3 +22,6 @@ libapi_a_SOURCES = \
 		tet_exec.c \
 		tet_fork.c \
 		tet_spawn.c
+
+# This file didn't get compiled before the autotools conversion
+#		dcancel.c 
diff --git a/src/tet3/apilib/makefile b/src/tet3/apilib/makefile.old
index 20fede91..20fede91 100644
--- a/src/tet3/apilib/makefile
+++ b/src/tet3/apilib/makefile.old
diff --git a/src/tet3/apishlib/makefile b/src/tet3/apishlib/makefile.old
index 4d726adb..4d726adb 100644
--- a/src/tet3/apishlib/makefile
+++ b/src/tet3/apishlib/makefile.old
diff --git a/src/tet3/dtet2lib/Makefile.am b/src/tet3/dtet2lib/Makefile.am
index 12a0c09b..6079c18a 100644
--- a/src/tet3/dtet2lib/Makefile.am
+++ b/src/tet3/dtet2lib/Makefile.am
@@ -78,3 +78,4 @@ libapi_a_SOURCES = \
 		w32err.c \
 		wait3.c \
 		wsaerr.c 
+
diff --git a/src/tet3/dtet2lib/makefile b/src/tet3/dtet2lib/makefile.old
index 42ca182b..42ca182b 100644
--- a/src/tet3/dtet2lib/makefile
+++ b/src/tet3/dtet2lib/makefile.old
diff --git a/src/tet3/inetlib/Makefile.am b/src/tet3/inetlib/Makefile.am
index f080ca16..388d140f 100644
--- a/src/tet3/inetlib/Makefile.am
+++ b/src/tet3/inetlib/Makefile.am
@@ -15,3 +15,4 @@ libapi_a_SOURCES = \
 		tptab.c \
 		tsinfo.c \
 		tstcmenv.c
+
diff --git a/src/tet3/inetlib/makefile b/src/tet3/inetlib/makefile.old
index fe10728c..fe10728c 100644
--- a/src/tet3/inetlib/makefile
+++ b/src/tet3/inetlib/makefile.old
diff --git a/src/tet3/makefile b/src/tet3/makefile.old
index cd162435..cd162435 100644
--- a/src/tet3/makefile
+++ b/src/tet3/makefile.old
diff --git a/src/tet3/servlib/Makefile.am b/src/tet3/servlib/Makefile.am
index cbee513f..6a464d1d 100644
--- a/src/tet3/servlib/Makefile.am
+++ b/src/tet3/servlib/Makefile.am
@@ -1,5 +1,6 @@
+AM_CPPFLAGS=-DTET_LITE
 noinst_LIBRARIES = libapi.a
-libapi_a_CFLAGS = -I ../inc -I $(top_srcdir)/include
+libapi_a_CFLAGS = -I ../inc -I $(top_srcdir)/include 
 libapi_a_SOURCES = \
 		cloop.c \
 		fio.c \
@@ -61,3 +62,4 @@ libapi_a_SOURCES = \
 		xdxropen.c \
 		xdxrsend.c \
 		xdxrsys.c
+
diff --git a/src/tet3/servlib/makefile b/src/tet3/servlib/makefile.old
index 23b53dc7..23b53dc7 100644
--- a/src/tet3/servlib/makefile
+++ b/src/tet3/servlib/makefile.old
diff --git a/src/tet3/tcc/Makefile.am b/src/tet3/tcc/Makefile.am
index da671fc3..db37e676 100644
--- a/src/tet3/tcc/Makefile.am
+++ b/src/tet3/tcc/Makefile.am
@@ -1,6 +1,8 @@
+AM_CPPFLAGS=-DTET_LITE
 bin_PROGRAMS = tcc
 tcc_CFLAGS = -I ../inc -I $(top_srcdir)/include
-tcc_LDADD = ../tcm/libapi.a ../apilib/libapi.a ../dtet2lib/libapi.a ../tcclib/libtcc.a ../servlib/libapi.a ../inetlib/libapi.a
+# Note: the order of these is important
+tcc_LDADD = ../tcm/libapi.a ../apilib/libapi.a ../tcclib/libapi.a ../dtet2lib/libapi.a
 tcc_SOURCES = cleanup.c \
 		config.c \
 		copysave.c \
@@ -37,11 +39,10 @@ tcc_SOURCES = cleanup.c \
 		utils.c \
 		ynstr.c
 
-# Not sure about these ones - maybe if LITE isn't defined?
-
-#		tcc_in.c 
+# These didn't get compiled before the autotools conversion.
 #		fake_in.c 
 #		fake_xt.c
 #		scenpp.c 
 #		tcc_bs.c 
+#		tcc_in.c
 #		tcc_xt.c 
diff --git a/src/tet3/tcc/makefile b/src/tet3/tcc/makefile.old
index a8fa0c49..48e5633b 100644
--- a/src/tet3/tcc/makefile
+++ b/src/tet3/tcc/makefile.old
@@ -235,27 +235,27 @@ tcc_xt$O: tcc_xt.c
 # dependencies
 cleanup$O: $(DINC)/tet_api.h $(INC)/dtmac.h $(INC)/ltoa.h tcc.h
 
-config$O: $(INC)/config.h $(INC)/dtetlib.h $(INC)/dtmac.h $(INC)/dtmsg.h \
+config$O: $(INC)/tet3_config.h $(INC)/dtetlib.h $(INC)/dtmac.h $(INC)/dtmsg.h \
 	$(INC)/error.h $(INC)/globals.h $(INC)/ltoa.h $(INC)/ptab.h \
 	$(INC)/servlib.h dtcc.h systab.h tcc.h
 
-copysave$O: $(INC)/config.h $(INC)/dtetlib.h $(INC)/dtmac.h $(INC)/dtmsg.h \
+copysave$O: $(INC)/tet3_config.h $(INC)/dtetlib.h $(INC)/dtmac.h $(INC)/dtmsg.h \
 	$(INC)/error.h $(INC)/ltoa.h $(INC)/servlib.h $(INC)/tcclib.h \
 	proctab.h scentab.h systab.h tcc.h
 
 dirtab$O: $(INC)/dtmac.h $(INC)/ltoa.h dirtab.h
 
-dtcc$O: $(INC)/config.h $(INC)/dtetlib.h $(INC)/dtmac.h $(INC)/dtmsg.h \
+dtcc$O: $(INC)/tet3_config.h $(INC)/dtetlib.h $(INC)/dtmac.h $(INC)/dtmsg.h \
 	$(INC)/error.h $(INC)/globals.h $(INC)/ltoa.h $(INC)/ptab.h \
 	$(INC)/server.h $(INC)/servlib.h $(INC)/tslib.h dtcc.h systab.h tcc.h
 
-environ$O: $(INC)/config.h $(INC)/dtetlib.h $(INC)/dtmac.h $(INC)/error.h \
+environ$O: $(INC)/tet3_config.h $(INC)/dtetlib.h $(INC)/dtmac.h $(INC)/error.h \
 	$(INC)/ltoa.h $(INC)/servlib.h systab.h tcc.h
 
 error$O: $(INC)/dtetlib.h $(INC)/dtmac.h $(INC)/globals.h $(INC)/ltoa.h \
 	proctab.h scentab.h tcc.h
 
-exec$O: $(INC)/config.h $(INC)/dtmac.h $(INC)/error.h $(INC)/ltoa.h \
+exec$O: $(INC)/tet3_config.h $(INC)/dtmac.h $(INC)/error.h $(INC)/ltoa.h \
 	$(INC)/servlib.h $(INC)/tcclib.h proctab.h scentab.h systab.h tcc.h
 
 fake$O: $(INC)/dtmac.h $(INC)/dtmsg.h $(INC)/error.h $(INC)/ptab.h \
@@ -273,7 +273,7 @@ jnlproc$O: $(DINC)/tet_api.h $(DINC)/tet_jrnl.h $(INC)/dtetlib.h \
 	$(INC)/dtmac.h $(INC)/error.h $(INC)/ltoa.h $(INC)/servlib.h \
 	proctab.h scentab.h tcc.h
 
-journal$O: $(DINC)/tet_jrnl.h $(INC)/bstring.h $(INC)/config.h \
+journal$O: $(DINC)/tet_jrnl.h $(INC)/bstring.h $(INC)/tet3_config.h \
 	$(INC)/dtetlib.h $(INC)/dtmac.h $(INC)/error.h $(INC)/globals.h \
 	$(INC)/ltoa.h proctab.h scentab.h tcc.h
 
@@ -292,10 +292,10 @@ proctab$O: $(INC)/bstring.h $(INC)/dtmac.h $(INC)/error.h $(INC)/ftoa.h \
 proctc$O: $(DINC)/tet_jrnl.h $(INC)/dtmac.h $(INC)/error.h $(INC)/ltoa.h \
 	proctab.h scentab.h tcc.h
 
-proctcd$O: $(INC)/config.h $(INC)/dtmac.h $(INC)/error.h $(INC)/ltoa.h \
+proctcd$O: $(INC)/tet3_config.h $(INC)/dtmac.h $(INC)/error.h $(INC)/ltoa.h \
 	$(INC)/servlib.h proctab.h scentab.h systab.h tcc.h
 
-rescode$O: $(INC)/config.h $(INC)/dtetlib.h $(INC)/dtmac.h $(INC)/dtmsg.h \
+rescode$O: $(INC)/tet3_config.h $(INC)/dtetlib.h $(INC)/dtmac.h $(INC)/dtmsg.h \
 	$(INC)/error.h $(INC)/globals.h $(INC)/ltoa.h $(INC)/restab.h \
 	$(INC)/servlib.h systab.h tcc.h
 
@@ -330,7 +330,7 @@ sigtrap$O: $(INC)/dtmac.h $(INC)/error.h $(INC)/ltoa.h $(INC)/tcclib.h \
 syscall$O: $(INC)/dtetlib.h $(INC)/dtmac.h $(INC)/dtmsg.h $(INC)/error.h \
 	$(INC)/ltoa.h $(INC)/servlib.h $(INC)/tcclib.h tcc.h
 
-systab$O: $(INC)/bstring.h $(INC)/config.h $(INC)/dtmac.h $(INC)/dtmsg.h \
+systab$O: $(INC)/bstring.h $(INC)/tet3_config.h $(INC)/dtmac.h $(INC)/dtmsg.h \
 	$(INC)/error.h $(INC)/llist.h $(INC)/ltoa.h $(INC)/ptab.h dirtab.h \
 	scentab.h systab.h tcc.h
 
@@ -341,20 +341,20 @@ tcc_bs$O: $(INC)/avmsg.h $(INC)/dtetlib.h $(INC)/dtmac.h $(INC)/dtmsg.h \
 	$(INC)/error.h $(INC)/ptab.h $(INC)/server_bs.h $(INC)/servlib.h \
 	$(INC)/valmsg.h dtcc.h tcc.h
 
-tcc_in$O: $(INC)/bstring.h $(INC)/config.h $(INC)/dtetlib.h $(INC)/dtmac.h \
+tcc_in$O: $(INC)/bstring.h $(INC)/tet3_config.h $(INC)/dtetlib.h $(INC)/dtmac.h \
 	$(INC)/dtmsg.h $(INC)/error.h $(INC)/globals.h $(INC)/inetlib_in.h \
 	$(INC)/ltoa.h $(INC)/ptab.h $(INC)/server.h $(INC)/server_in.h \
 	$(INC)/sysent.h $(INC)/tptab_in.h $(INC)/tsinfo_in.h $(INC)/tslib.h \
 	dtcc.h tcc.h
 
-tcc_xt$O: $(INC)/config.h $(INC)/dtetlib.h $(INC)/dtmac.h $(INC)/dtmsg.h \
+tcc_xt$O: $(INC)/tet3_config.h $(INC)/dtetlib.h $(INC)/dtmac.h $(INC)/dtmsg.h \
 	$(INC)/error.h $(INC)/globals.h $(INC)/ltoa.h $(INC)/ptab.h \
 	$(INC)/server.h $(INC)/server_xt.h $(INC)/sysent.h $(INC)/tptab_xt.h \
 	$(INC)/tsinfo_xt.h $(INC)/tslib.h $(INC)/xtilib_xt.h dtcc.h tcc.h
 
 tcname$O: $(INC)/dtmac.h $(INC)/error.h proctab.h scentab.h tcc.h
 
-tool$O: $(DINC)/tet_jrnl.h $(INC)/config.h $(INC)/dtetlib.h $(INC)/dtmac.h \
+tool$O: $(DINC)/tet_jrnl.h $(INC)/tet3_config.h $(INC)/dtetlib.h $(INC)/dtmac.h \
 	$(INC)/dtmsg.h $(INC)/error.h $(INC)/ltoa.h $(INC)/servlib.h \
 	proctab.h scentab.h systab.h tcc.h
 
diff --git a/src/tet3/tcclib/Makefile.am b/src/tet3/tcclib/Makefile.am
index 1f2d83db..6f2932fb 100644
--- a/src/tet3/tcclib/Makefile.am
+++ b/src/tet3/tcclib/Makefile.am
@@ -1,7 +1,8 @@
-noinst_LIBRARIES = libtcc.a
+AM_CPPFLAGS=-DTET_LITE
+noinst_LIBRARIES = libapi.a
 
-libtcc_a_CFLAGS = -I ../inc -I $(top_srcdir)/include
-libtcc_a_SOURCES = \
+libapi_a_CFLAGS = -I ../inc -I $(top_srcdir)/include
+libapi_a_SOURCES = \
 		lockfile.c \
 		lsdir.c \
 		mktmpdir.c \
diff --git a/src/tet3/tcclib/makefile b/src/tet3/tcclib/makefile.old
index 8f264702..8f264702 100644
--- a/src/tet3/tcclib/makefile
+++ b/src/tet3/tcclib/makefile.old
diff --git a/src/tet3/tcm/Makefile.am b/src/tet3/tcm/Makefile.am
index cf98d744..5458c38d 100644
--- a/src/tet3/tcm/Makefile.am
+++ b/src/tet3/tcm/Makefile.am
@@ -1,14 +1,18 @@
+AM_CPPFLAGS=-DTET_LITE
 noinst_LIBRARIES = libapi.a
 libapi_a_CFLAGS = -I ../inc -I $(top_srcdir)/include
-libapi_a_SOURCES = child.c
+libapi_a_SOURCES = child.c \
 			ckversion.c \
-			dtcm.c \
 			dynlink.c \
 			ictp.c \
-			tcm_bs.c \
-			tcm.c \
-			tcmchild.c \
-			tcmfuncs.c \
-			tcm_in.c \
-			tcmrem.c \
-			tcm_xt.c
+			tcmfuncs.c
+
+
+# These didn't get compiled before the autotools conversion
+#			tcm_bs.c 
+#			tcm_in.c 
+#			tcmrem.c 
+#			tcm_xt.c
+#			tcmchild.c 
+#			tcm.c 
+#			dtcm.c 
diff --git a/src/tet3/tcm/makefile b/src/tet3/tcm/makefile.old
index 53ecb2f4..53ecb2f4 100644
--- a/src/tet3/tcm/makefile
+++ b/src/tet3/tcm/makefile.old
diff --git a/xts5/Makefile b/xts5/makefile.old
index 5c6ee358..5c6ee358 100644
--- a/xts5/Makefile
+++ b/xts5/makefile.old