- generate Makefile.in in unix/* subtree from Makefile.am
git-svn-id: svn://svn.code.sf.net/p/tigervnc/code/branches/1.5-xserver@2490 3789f03b-4d11-0410-bbf8-ca57d06f2519
diff --git a/unix/vncviewer/Makefile.am b/unix/vncviewer/Makefile.am
new file mode 100644
index 0000000..a5b9ac3
--- /dev/null
+++ b/unix/vncviewer/Makefile.am
@@ -0,0 +1,11 @@
+bin_PROGRAMS = vncviewer
+
+vncviewer_SOURCES = DesktopWindow.cxx CConn.cxx vncviewer.cxx buildtime.c
+
+vncviewer_CPPFLAGS = -I$(COMMON_DIR) -I$(top_srcdir) -I$(top_srcdir)/tx \
+ -I$(top_srcdir)/intl -DLOCALEDIR=\"$(localedir)\" @X_CFLAGS@ # X_CFLAGS are really CPPFLAGS
+
+vncviewer_LDADD = $(top_srcdir)/tx/libtx.la $(COMMON_DIR)/rfb/librfb.la \
+ $(COMMON_DIR)/network/libnetwork.la $(COMMON_DIR)/rdr/librdr.la \
+ @X_PRE_LIBS@ @X_LIBS@ -lXext -lX11 @X_EXTRA_LIBS@ @CL_LIB@ \
+ @DMEDIA_LIB@ # @LIBINTL@
diff --git a/unix/vncviewer/Makefile.in b/unix/vncviewer/Makefile.in
deleted file mode 100644
index e99720e..0000000
--- a/unix/vncviewer/Makefile.in
+++ /dev/null
@@ -1,33 +0,0 @@
-
-PACKAGE = @PACKAGE@
-VERSION = @VERSION@
-
-prefix = @prefix@
-datadir = @datadir@
-localedir = $(datadir)/locale
-
-SRCS = DesktopWindow.cxx CConn.cxx vncviewer.cxx
-
-OBJS = $(SRCS:.cxx=.o)
-
-program = vncviewer
-
-DEP_LIBS = $(TOP)/tx/libtx.a \
- $(COMMON)/rfb/librfb.a \
- $(COMMON)/network/libnetwork.a \
- $(COMMON)/rdr/librdr.a
-
-EXTRA_LIBS = @ZLIB_LIB@ @JPEG_LIB@ @X_PRE_LIBS@ @X_LIBS@ -lXext -lX11 \
- @X_EXTRA_LIBS@ @CL_LIB@ @DMEDIA_LIB@ @LIBINTL@
-
-DIR_CPPFLAGS = -I$(COMMON) -I$(TOP) -I$(TOP)/tx -I$(TOP)/intl -DLOCALEDIR=\"$(localedir)\" @X_CFLAGS@ # X_CFLAGS are really CPPFLAGS
-
-all:: $(program)
-
-$(program): $(OBJS) buildtime.o $(DEP_LIBS)
- rm -f $(program)
- $(CXXLD) $(CXXFLAGS) $(LDFLAGS) -o $@ $(OBJS) buildtime.o $(DEP_LIBS) $(LIBS) $(EXTRA_LIBS)
-
-buildtime.o: $(OBJS) $(DEP_LIBS)
-
-# followed by boilerplate.mk