diff options
| author | Constantin Kaplinsky <const@tightvnc.com> | 2008-09-28 05:08:48 +0000 |
|---|---|---|
| committer | Constantin Kaplinsky <const@tightvnc.com> | 2008-09-28 05:08:48 +0000 |
| commit | ea7b6507b68a715797216e0cfecac9a6aadd435f (patch) | |
| tree | c48c5548ddab3e9d5d4011b43b5b79926c5eb417 /unix/vncpasswd | |
| parent | 843bf67909e6b5c9be0a4d73ec6105fff4e42196 (diff) | |
| parent | 68afc5647982eea284e325a9d89677dc8ccb636c (diff) | |
| download | tigervnc-ea7b6507b68a715797216e0cfecac9a6aadd435f.tar.gz tigervnc-ea7b6507b68a715797216e0cfecac9a6aadd435f.zip | |
Merged changes from branches/1.5-xserver (revision range 2432:2631) back to trunk.
git-svn-id: svn://svn.code.sf.net/p/tigervnc/code/trunk@2829 3789f03b-4d11-0410-bbf8-ca57d06f2519
Diffstat (limited to 'unix/vncpasswd')
| -rw-r--r-- | unix/vncpasswd/Makefile.am | 7 | ||||
| -rw-r--r-- | unix/vncpasswd/Makefile.in | 18 |
2 files changed, 7 insertions, 18 deletions
diff --git a/unix/vncpasswd/Makefile.am b/unix/vncpasswd/Makefile.am new file mode 100644 index 00000000..66fdf9d3 --- /dev/null +++ b/unix/vncpasswd/Makefile.am @@ -0,0 +1,7 @@ +bin_PROGRAMS = vncpasswd + +vncpasswd_SOURCES = vncpasswd.cxx + +vncpasswd_CPPFLAGS = -I$(COMMON_DIR) + +vncpasswd_LDADD = $(COMMON_DIR)/rfb/librfb.la diff --git a/unix/vncpasswd/Makefile.in b/unix/vncpasswd/Makefile.in deleted file mode 100644 index a159b726..00000000 --- a/unix/vncpasswd/Makefile.in +++ /dev/null @@ -1,18 +0,0 @@ - -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 |