xauth now compiles

5 files changed, 133 insertions, 1 deletions

diff --git a/apps/xhost/inet.c b/apps/common/inet.c
index e6c0a1554..e6c0a1554 100644
--- a/apps/xhost/inet.c
+++ b/apps/common/inet.c
diff --git a/apps/common/makefile b/apps/common/makefile
new file mode 100644
index 000000000..e261f52c9
--- /dev/null
+++ b/apps/common/makefile
@@ -0,0 +1,3 @@
+LIBRARY = common
+
+CSRCS = inet.c
diff --git a/apps/xauth/config.h b/apps/xauth/config.h
new file mode 100644
index 000000000..8152de05a
--- /dev/null
+++ b/apps/xauth/config.h
@@ -0,0 +1,94 @@
+/* config.h.in.  Generated from configure.ac by autoheader.  */
+
+/* Define to 1 if `struct sockaddr_in' has a `sin_len' member */
+#undef BSD44SOCKETS
+
+/* Define to 1 if you have the <inttypes.h> header file. */
+#undef HAVE_INTTYPES_H
+
+/* Define to 1 if you have the `ws2_32' library (-lws2_32). */
+#undef HAVE_LIBWS2_32
+
+/* Define to 1 if you have the <memory.h> header file. */
+#undef HAVE_MEMORY_H
+
+/* Define to 1 if you have the <net/errno.h> header file. */
+#undef HAVE_NET_ERRNO_H
+
+/* Define to 1 if the system has the type `socklen_t'. */
+#undef HAVE_SOCKLEN_T
+
+/* Define to 1 if you have the <stdint.h> header file. */
+#define HAVE_STDINT_H 1
+
+/* Define to 1 if you have the <stdlib.h> header file. */
+#define HAVE_STDLIB_H 1
+
+/* Define to 1 if you have the <strings.h> header file. */
+#undef HAVE_STRINGS_H
+
+/* Define to 1 if you have the <string.h> header file. */
+#define HAVE_STRING_H 1
+
+/* Define to 1 if you have the `strlcpy' function. */
+#undef HAVE_STRLCPY
+
+/* Define to 1 if you have the <sys/stat.h> header file. */
+#define HAVE_SYS_STAT_H 1
+
+/* Define to 1 if you have the <sys/types.h> header file. */
+#define HAVE_SYS_TYPES_H 1
+
+/* Define to 1 if you have the <unistd.h> header file. */
+#define HAVE_UNISTD_H 1
+
+/* Support IPv6 for TCP connections */
+#define IPv6 1
+
+/* Support os-specific local connections */
+#undef LOCALCONN
+
+/* Name of package */
+#undef PACKAGE
+
+/* Define to the address where bug reports for this package should be sent. */
+#undef PACKAGE_BUGREPORT
+
+/* Define to the full name of this package. */
+#undef PACKAGE_NAME
+
+/* Define to the full name and version of this package. */
+#undef PACKAGE_STRING
+
+/* Define to the one symbol short name of this package. */
+#undef PACKAGE_TARNAME
+
+/* Define to the home page for this package. */
+#undef PACKAGE_URL
+
+/* Define to the version of this package. */
+#undef PACKAGE_VERSION
+
+/* Major version of this package */
+#undef PACKAGE_VERSION_MAJOR
+
+/* Minor version of this package */
+#undef PACKAGE_VERSION_MINOR
+
+/* Patch version of this package */
+#undef PACKAGE_VERSION_PATCHLEVEL
+
+/* Define as the return type of signal handlers (`int' or `void'). */
+#define RETSIGTYPE void
+
+/* Define to 1 if you have the ANSI C header files. */
+#undef STDC_HEADERS
+
+/* Support TCP socket connections */
+#define TCPCONN 1
+
+/* Support UNIX socket connections */
+#undef UNIXCONN
+
+/* Version number of package */
+#undef VERSION
diff --git a/apps/xauth/makefile b/apps/xauth/makefile
new file mode 100644
index 000000000..235a5d46e
--- /dev/null
+++ b/apps/xauth/makefile
@@ -0,0 +1,34 @@
+TTYAPP = xauth
+
+INCLUDELIBFILES = \
+ ..\common\$(OBJDIR)\common.lib \
+ $(MHMAKECONF)\libX11\src\xkb\$(OBJDIR)\libxkb.lib \
+ $(MHMAKECONF)\libX11\src\xlibi18n\$(OBJDIR)\libi18n.lib \
+ $(MHMAKECONF)\libX11\modules\lc\xlocale\$(OBJDIR)\libxlocale.lib \
+ $(MHMAKECONF)\libX11\modules\lc\utf8\$(OBJDIR)\libxlcUTF8Load.lib \
+ $(MHMAKECONF)\libX11\modules\lc\def\$(OBJDIR)\libxlcDef.lib \
+ $(MHMAKECONF)\libX11\modules\om\generic\$(OBJDIR)\libxomGeneric.lib \
+ $(MHMAKECONF)\libX11\modules\lc\gen\$(OBJDIR)\liblcGenConvLoad.lib \
+ $(MHMAKECONF)\libX11\modules\im\ximcp\$(OBJDIR)\libximcp.lib \
+ $(MHMAKECONF)\libxcb\src\$(OBJDIR)\libxcb.lib \
+ $(MHMAKECONF)\libxau\$(OBJDIR)\libXau.lib \
+ $(MHMAKECONF)\libXmu\src\$(OBJDIR)\libXmu.lib \
+ $(MHMAKECONF)\libXext\src\$(OBJDIR)\libXext.lib \
+ $(MHMAKECONF)\libX11\src\$(OBJDIR)\libx11.lib \
+
+LIBDIRS=$(dir $(INCLUDELIBFILES))
+
+load_makefile $(LIBDIRS:%$(OBJDIR)\=%makefile MAKESERVER=0 DEBUG=$(DEBUG);)
+
+ifeq ($(DEBUG),1)
+LINKLIBS += $(MHMAKECONF)\pthreads\pthreadVC2d.lib
+else
+LINKLIBS += $(MHMAKECONF)\pthreads\pthreadVC2.lib
+endif
+
+CSRCS =	\
+        gethost.c \
+        parsedpy.c \
+        process.c \
+        xauth.c
+
diff --git a/apps/xhost/makefile b/apps/xhost/makefile
index 357b93fb3..5425bcde2 100644
--- a/apps/xhost/makefile
+++ b/apps/xhost/makefile
@@ -3,6 +3,7 @@ DEFINES += BAD_ARPAINET TCPCONN IPv6
 TTYAPP = xhost
 
 INCLUDELIBFILES = \
+ ..\common\$(OBJDIR)\common.lib \
  $(MHMAKECONF)\libX11\src\xkb\$(OBJDIR)\libxkb.lib \
  $(MHMAKECONF)\libX11\src\xlibi18n\$(OBJDIR)\libi18n.lib \
  $(MHMAKECONF)\libX11\modules\lc\xlocale\$(OBJDIR)\libxlocale.lib \
@@ -26,4 +27,4 @@ else
 LINKLIBS += $(MHMAKECONF)\pthreads\pthreadVC2.lib
 endif
 
-CSRCS = xhost.c inet.c
+CSRCS = xhost.c