summaryrefslogtreecommitdiffstats
path: root/unix/vncpasswd
diff options
context:
space:
mode:
authorAdam Tkac <atkac@redhat.com>2008-03-22 11:20:54 +0000
committerAdam Tkac <atkac@redhat.com>2008-03-22 11:20:54 +0000
commitfded0784456d6fb106d084d961ebbf5e4227c6a6 (patch)
tree54ba7d062bc775e57c5b7050d3853abcb8ce0672 /unix/vncpasswd
parent2b92f2f3b6f57dcc61a59d1fb2adf4ea46120705 (diff)
downloadtigervnc-fded0784456d6fb106d084d961ebbf5e4227c6a6.tar.gz
tigervnc-fded0784456d6fb106d084d961ebbf5e4227c6a6.zip
After discussion with Constantin reverted 2433, 2434, 2436, 2437 and 2438
(build automation and i18n changes). Latest server changes (2439 and 2440) are OK. git-svn-id: svn://svn.code.sf.net/p/tigervnc/code/branches/1.5-xserver@2442 3789f03b-4d11-0410-bbf8-ca57d06f2519
Diffstat (limited to 'unix/vncpasswd')
-rw-r--r--unix/vncpasswd/Makefile.am7
-rw-r--r--unix/vncpasswd/Makefile.in18
2 files changed, 18 insertions, 7 deletions
diff --git a/unix/vncpasswd/Makefile.am b/unix/vncpasswd/Makefile.am
deleted file mode 100644
index 52424924..00000000
--- a/unix/vncpasswd/Makefile.am
+++ /dev/null
@@ -1,7 +0,0 @@
-bin_PROGRAMS = vncpasswd
-
-vncpasswd_SOURCES = vncpasswd.cxx
-
-vncpasswd_CPPFLAGS = -I$(COMMON_DIR)
-
-vncpasswd_LDADD = $(RFB_LIBS)
diff --git a/unix/vncpasswd/Makefile.in b/unix/vncpasswd/Makefile.in
new file mode 100644
index 00000000..a159b726
--- /dev/null
+++ b/unix/vncpasswd/Makefile.in
@@ -0,0 +1,18 @@
+
+SRCS = vncpasswd.cxx
+
+OBJS = vncpasswd.o
+
+program = vncpasswd
+
+DEP_LIBS = $(COMMON)/rfb/librfb.a
+
+DIR_CPPFLAGS = -I$(COMMON)
+
+all:: $(program)
+
+$(program): $(OBJS) $(DEP_LIBS)
+ rm -f $(program)
+ $(CXXLD) $(CXXFLAGS) $(LDFLAGS) -o $@ $(OBJS) $(DEP_LIBS) $(LIBS)
+
+# followed by boilerplate.mk