- generate Makefile.in from Makefile.am template

git-svn-id: svn://svn.code.sf.net/p/tigervnc/code/branches/1.5-xserver@2466 3789f03b-4d11-0410-bbf8-ca57d06f2519

diff --git a/common/Makefile.am b/common/Makefile.am
new file mode 100644 (file)
index 0000000..ef1cdaa
--- /dev/null
+++ b/common/Makefile.am
@@ -0,0 +1 @@
+SUBDIRS = @ZLIB_DIR@ @JPEG_DIR@ rdr network Xregion rfb

diff --git a/common/Makefile.in b/common/Makefile.in
deleted file mode 100644 (file)
index 29aa263..0000000
--- a/common/Makefile.in
+++ /dev/null
@@ -1,4 +0,0 @@
-
-SUBDIRS = @ZLIB_DIR@ @JPEG_DIR@ rdr network Xregion rfb
-
-# followed by boilerplate.mk

diff --git a/common/Xregion/Makefile.am b/common/Xregion/Makefile.am
new file mode 100644 (file)
index 0000000..03151e2
--- /dev/null
+++ b/common/Xregion/Makefile.am
@@ -0,0 +1,3 @@
+noinst_LTLIBRARIES = libXregion.la
+
+libXregion_la_SOURCES = Region.c

diff --git a/common/Xregion/Makefile.in b/common/Xregion/Makefile.in
deleted file mode 100644 (file)
index 878a29b..0000000
--- a/common/Xregion/Makefile.in
+++ /dev/null
@@ -1,15 +0,0 @@
-
-SRCS = Region.c
-
-OBJS = $(SRCS:.c=.o)
-
-library = libXregion.a
-
-all:: $(library)
-
-$(library): $(OBJS)
-       rm -f $(library)
-       $(AR) $(library) $(OBJS)
-       $(RANLIB) $(library)
-
-# followed by boilerplate.mk

diff --git a/common/configure.ac b/common/configure.ac
index 4be7128b2a26cc802bce1a380a92ef2f43e06384..8e81bd818c6d623d2dd0469f87a1da46633f6dae 100644 (file)
--- a/common/configure.ac
+++ b/common/configure.ac
@@ -2,11 +2,13 @@ dnl Process this file with autoconf to produce a configure script.
 AC_PREREQ([2.61])
 AC_INIT([librfb], [1.5.0a1], [http://www.tightvnc.com/bugs.html])
 
+AM_INIT_AUTOMAKE([-Wall foreign dist-bzip2])
+
 dnl Checks for programs.
 AC_PROG_CC
 AC_PROG_CXX
 AC_PROG_INSTALL
-AC_PROG_RANLIB
+AC_PROG_LIBTOOL
 AC_PROG_MAKE_SET
 AC_LANG([C++])
 
@@ -45,17 +47,16 @@ fi
 dnl Checks for IRIX-specific Compression Library.
 AC_CHECK_LIB(cl, clQuerySchemeFromName,
   [AC_DEFINE(HAVE_CL)
-  PLATFORM_CXXSRCS="$PLATFORM_CXXSRCS IrixCLJpegCompressor.cxx"
+  IRIX_COMPRESS=yes
   LIBS="$LIBS -lcl"])
+AM_CONDITIONAL([IRIX_COMPRESS], [ test "x$IRIX_COMPRESS" = xyes ])
 
 dnl Checks for IRIX-specific Digital Media libraries.
 AC_CHECK_LIB(dmedia, dmICCreate,
   [AC_DEFINE(HAVE_DMEDIA)
-  PLATFORM_CXXSRCS="$PLATFORM_CXXSRCS IrixDMJpegCompressor.cxx"
-  PLATFORM_CXXSRCS="$PLATFORM_CXXSRCS IrixDMIC_RawToJpeg.cxx"
+  IRIX_MEDIA=yes
   LIBS="$LIBS -ldmedia"])
-
-AC_SUBST(PLATFORM_CXXSRCS)
+AM_CONDITIONAL([IRIX_MEDIA], [ test "x$IRIX_MEDIA" = xyes ])
 
 AC_ARG_WITH([tight-zlib],
        AS_HELP_STRING([--with-tight-zlib],
@@ -134,9 +135,8 @@ if (sh -c "make --version" 2>/dev/null | grep GNU 2>&1 >/dev/null); then
   fi
 fi
 
-AC_OUTPUT(Makefile:Makefile.in:$BOILERPLATE \
-         rdr/Makefile:rdr/Makefile.in:$BOILERPLATE \
-         network/Makefile:network/Makefile.in:$BOILERPLATE \
-         Xregion/Makefile:Xregion/Makefile.in:$BOILERPLATE \
-         rfb/Makefile:rfb/Makefile.in:$BOILERPLATE \
-)
+AC_OUTPUT([Makefile
+          rdr/Makefile
+          network/Makefile
+          Xregion/Makefile
+          rfb/Makefile])

diff --git a/common/network/Makefile.am b/common/network/Makefile.am
new file mode 100644 (file)
index 0000000..716e8ba
--- /dev/null
+++ b/common/network/Makefile.am
@@ -0,0 +1,6 @@
+noinst_LTLIBRARIES = libnetwork.la
+
+libnetwork_la_SOURCES = TcpSocket.cxx
+
+libnetwork_la_CPPFLAGS = -I$(top_srcdir) @SOCKLEN_T_DEFINE@
+

diff --git a/common/network/Makefile.in b/common/network/Makefile.in
deleted file mode 100644 (file)
index 8aed303..0000000
--- a/common/network/Makefile.in
+++ /dev/null
@@ -1,17 +0,0 @@
-
-SRCS = TcpSocket.cxx
-
-OBJS = $(SRCS:.cxx=.o)
-
-DIR_CPPFLAGS = -I$(top_srcdir) @SOCKLEN_T_DEFINE@
-
-library = libnetwork.a
-
-all:: $(library)
-
-$(library): $(OBJS)
-       rm -f $(library)
-       $(AR) $(library) $(OBJS)
-       $(RANLIB) $(library)
-
-# followed by boilerplate.mk

diff --git a/common/rdr/Makefile.am b/common/rdr/Makefile.am
new file mode 100644 (file)
index 0000000..0e88896
--- /dev/null
+++ b/common/rdr/Makefile.am
@@ -0,0 +1,7 @@
+noinst_LTLIBRARIES = librdr.la
+
+librdr_la_SOURCES = Exception.cxx FdInStream.cxx FdOutStream.cxx InStream.cxx \
+       RandomStream.cxx ZlibInStream.cxx ZlibOutStream.cxx HexInStream.cxx \
+       HexOutStream.cxx
+
+librdr_la_CPPFLAGS = -I$(top_srcdir) @ZLIB_INCLUDE@

diff --git a/common/rdr/Makefile.in b/common/rdr/Makefile.in
deleted file mode 100644 (file)
index 09fa554..0000000
--- a/common/rdr/Makefile.in
+++ /dev/null
@@ -1,19 +0,0 @@
-
-SRCS = Exception.cxx FdInStream.cxx FdOutStream.cxx InStream.cxx \
-       RandomStream.cxx ZlibInStream.cxx ZlibOutStream.cxx \
-       HexInStream.cxx HexOutStream.cxx
-
-OBJS = $(SRCS:.cxx=.o)
-
-DIR_CPPFLAGS = -I$(top_srcdir) @ZLIB_INCLUDE@
-
-library = librdr.a
-
-all:: $(library)
-
-$(library): $(OBJS)
-       rm -f $(library)
-       $(AR) $(library) $(OBJS)
-       $(RANLIB) $(library)
-
-# followed by boilerplate.mk

diff --git a/common/rfb/Makefile.am b/common/rfb/Makefile.am
new file mode 100644 (file)
index 0000000..8226fa6
--- /dev/null
+++ b/common/rfb/Makefile.am
@@ -0,0 +1,31 @@
+noinst_LTLIBRARIES = librfb.la
+
+librfb_la_SOURCES = Blacklist.cxx CConnection.cxx CMsgHandler.cxx \
+       CMsgReader.cxx CMsgReaderV3.cxx CMsgWriter.cxx CMsgWriterV3.cxx \
+       CSecurityVncAuth.cxx CapsContainer.cxx CapsList.cxx \
+       ComparingUpdateTracker.cxx Configuration.cxx ConnParams.cxx \
+       Cursor.cxx Decoder.cxx d3des.c Encoder.cxx FileInfo.cxx \
+       FileManager.cxx FileReader.cxx FileWriter.cxx JpegCompressor.cxx \
+       JpegEncoder.cxx HTTPServer.cxx HextileDecoder.cxx HextileEncoder.cxx \
+       KeyRemapper.cxx LogWriter.cxx Logger.cxx Logger_file.cxx \
+       Logger_stdio.cxx Password.cxx PixelBuffer.cxx PixelFormat.cxx \
+       RREEncoder.cxx RREDecoder.cxx RawDecoder.cxx RawEncoder.cxx \
+       Region.cxx SConnection.cxx SFTMsgReader.cxx SFTMsgWriter.cxx \
+       SFileTransfer.cxx SFileTransferManager.cxx SMsgHandler.cxx \
+       SMsgReader.cxx SMsgReaderV3.cxx SMsgWriter.cxx SMsgWriterV3.cxx \
+       ServerCore.cxx SSecurityFactoryStandard.cxx SSecurityVncAuth.cxx \
+       ScaledPixelBuffer.cxx ScaleFilters.cxx Timer.cxx TightDecoder.cxx \
+       TightEncoder.cxx TightPalette.cxx TransImageGetter.cxx \
+       TransferQueue.cxx UpdateTracker.cxx VNCSConnectionST.cxx \
+       VNCServerST.cxx ZRLEEncoder.cxx ZRLEDecoder.cxx encodings.cxx \
+       secTypes.cxx util.cxx
+
+if IRIX_COMPRESS
+librfb_la_SOURCES += IrixCLJpegCompressor.cxx
+endif
+if IRIX_MEDIA
+librfb_la_SOURCES += IrixDMJpegCompressor.cxx IrixDMIC_RawToJpeg.cxx
+endif
+
+librfb_la_CPPFLAGS = -I$(top_srcdir) @JPEG_INCLUDE@ @VSNPRINTF_DEFINE@ \
+       @STRCASECMP_DEFINE@ @STRNCASECMP_DEFINE@

diff --git a/common/rfb/Makefile.in b/common/rfb/Makefile.in
deleted file mode 100644 (file)
index 65dfafc..0000000
--- a/common/rfb/Makefile.in
+++ /dev/null
@@ -1,88 +0,0 @@
-
-CXXSRCS = \
-  Blacklist.cxx \
-  CConnection.cxx \
-  CMsgHandler.cxx \
-  CMsgReader.cxx \
-  CMsgReaderV3.cxx \
-  CMsgWriter.cxx \
-  CMsgWriterV3.cxx \
-  CSecurityVncAuth.cxx \
-  CapsContainer.cxx \
-  CapsList.cxx \
-  ComparingUpdateTracker.cxx \
-  Configuration.cxx \
-  ConnParams.cxx \
-  Cursor.cxx \
-  Decoder.cxx \
-  Encoder.cxx \
-  FileInfo.cxx \
-  FileManager.cxx \
-  FileReader.cxx \
-  FileWriter.cxx \
-  JpegCompressor.cxx \
-  JpegEncoder.cxx \
-  HTTPServer.cxx \
-  HextileDecoder.cxx \
-  HextileEncoder.cxx \
-  KeyRemapper.cxx \
-  LogWriter.cxx \
-  Logger.cxx \
-  Logger_file.cxx \
-  Logger_stdio.cxx \
-  Password.cxx \
-  PixelBuffer.cxx \
-  PixelFormat.cxx \
-  RREEncoder.cxx \
-  RREDecoder.cxx \
-  RawDecoder.cxx \
-  RawEncoder.cxx \
-  Region.cxx \
-  SConnection.cxx \
-  SFTMsgReader.cxx \
-  SFTMsgWriter.cxx \
-  SFileTransfer.cxx \
-  SFileTransferManager.cxx \
-  SMsgHandler.cxx \
-  SMsgReader.cxx \
-  SMsgReaderV3.cxx \
-  SMsgWriter.cxx \
-  SMsgWriterV3.cxx \
-  ServerCore.cxx \
-  SSecurityFactoryStandard.cxx \
-  SSecurityVncAuth.cxx \
-  ScaledPixelBuffer.cxx \
-  ScaleFilters.cxx \
-  Timer.cxx \
-  TightDecoder.cxx \
-  TightEncoder.cxx \
-  TightPalette.cxx \
-  TransImageGetter.cxx \
-  TransferQueue.cxx \
-  UpdateTracker.cxx \
-  VNCSConnectionST.cxx \
-  VNCServerST.cxx \
-  ZRLEEncoder.cxx \
-  ZRLEDecoder.cxx \
-  encodings.cxx \
-  secTypes.cxx \
-  util.cxx \
-  @PLATFORM_CXXSRCS@
-
-SRCS = d3des.c $(CXXSRCS)
-
-OBJS = d3des.o $(CXXSRCS:.cxx=.o)
-
-DIR_CPPFLAGS = -I$(top_srcdir) @JPEG_INCLUDE@ @VSNPRINTF_DEFINE@ \
-  @STRCASECMP_DEFINE@ @STRNCASECMP_DEFINE@
-
-library = librfb.a
-
-all:: $(library)
-
-$(library): $(OBJS)
-       rm -f $(library)
-       $(AR) $(library) $(OBJS)
-       $(RANLIB) $(library)
-
-# followed by boilerplate.mk