From 952ba8e78bf9cade030e8abe3c25aa03b0710c0e Mon Sep 17 00:00:00 2001 From: Adam Tkac Date: Sun, 20 Apr 2008 12:33:32 +0000 Subject: [PATCH] - reverted r2497 git-svn-id: svn://svn.code.sf.net/p/tigervnc/code/branches/1.5-xserver@2498 3789f03b-4d11-0410-bbf8-ca57d06f2519 --- Makefile.am | 1 - configure.ac | 8 -------- unix/Makefile.am | 2 +- unix/configure.ac | 2 ++ 4 files changed, 3 insertions(+), 10 deletions(-) delete mode 100644 Makefile.am delete mode 100644 configure.ac diff --git a/Makefile.am b/Makefile.am deleted file mode 100644 index c52b3470..00000000 --- a/Makefile.am +++ /dev/null @@ -1 +0,0 @@ -SUBDIRS = common unix diff --git a/configure.ac b/configure.ac deleted file mode 100644 index c8937610..00000000 --- a/configure.ac +++ /dev/null @@ -1,8 +0,0 @@ -AC_PREREQ(2.61) -AC_INIT([tightvnc], [1.5.0a1], [http://www.tightvnc.com/bugs.html]) -AM_INIT_AUTOMAKE([-Wall foreign dist-bzip2]) - -AC_CONFIG_SUBDIRS([common - unix]) - -AC_OUTPUT([Makefile]) diff --git a/unix/Makefile.am b/unix/Makefile.am index 246fbd70..59dbc221 100644 --- a/unix/Makefile.am +++ b/unix/Makefile.am @@ -1,3 +1,3 @@ -SUBDIRS = tx x0vncserver vncviewer vncpasswd po @VNCCONFIG_DIR@ +SUBDIRS = ../common tx x0vncserver vncviewer vncpasswd po @VNCCONFIG_DIR@ ACLOCAL_AMFLAGS = -I m4 diff --git a/unix/configure.ac b/unix/configure.ac index c0c2adfb..8c9d37d2 100644 --- a/unix/configure.ac +++ b/unix/configure.ac @@ -5,6 +5,8 @@ AM_INIT_AUTOMAKE([-Wall foreign dist-bzip2]) AC_SUBST([COMMON_DIR], ['$(top_srcdir)/../common']) +AC_CONFIG_SUBDIRS([../common]) + dnl Checks for programs. AC_PROG_CC AC_PROG_CXX -- 2.39.5