diff options
| author | Adam Tkac <atkac@redhat.com> | 2008-03-22 11:20:54 +0000 |
|---|---|---|
| committer | Adam Tkac <atkac@redhat.com> | 2008-03-22 11:20:54 +0000 |
| commit | fded0784456d6fb106d084d961ebbf5e4227c6a6 (patch) | |
| tree | 54ba7d062bc775e57c5b7050d3853abcb8ce0672 /unix/vncconfig | |
| parent | 2b92f2f3b6f57dcc61a59d1fb2adf4ea46120705 (diff) | |
| download | tigervnc-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/vncconfig')
| -rw-r--r-- | unix/vncconfig/Makefile.am | 9 | ||||
| -rw-r--r-- | unix/vncconfig/Makefile.in | 24 |
2 files changed, 24 insertions, 9 deletions
diff --git a/unix/vncconfig/Makefile.am b/unix/vncconfig/Makefile.am deleted file mode 100644 index 11b78299..00000000 --- a/unix/vncconfig/Makefile.am +++ /dev/null @@ -1,9 +0,0 @@ -bin_PROGRAMS = vncconfig - -vncconfig_SOURCES = buildtime.c QueryConnectDialog.cxx QueryConnectDialog.h \ - vncconfig.cxx vncExt.c vncExt.h - -vncconfig_CPPFLAGS = -I$(COMMON_DIR) -I$(TX_DIR) - -vncconfig_LDADD = $(TX_LIBS) $(RFB_LIBS) $(NETWORK_LIBS) $(RDR_LIBS) -lX11 \ - -lXext diff --git a/unix/vncconfig/Makefile.in b/unix/vncconfig/Makefile.in new file mode 100644 index 00000000..527a79ed --- /dev/null +++ b/unix/vncconfig/Makefile.in @@ -0,0 +1,24 @@ + +SRCS = vncExt.c vncconfig.cxx QueryConnectDialog.cxx + +OBJS = vncExt.o vncconfig.o QueryConnectDialog.o + +program = vncconfig + +DEP_LIBS = $(TOP)/tx/libtx.a $(COMMON)/rfb/librfb.a \ + $(COMMON)/network/libnetwork.a \ + $(COMMON)/rdr/librdr.a + +EXTRA_LIBS = @X_PRE_LIBS@ @X_LIBS@ -lX11 -lXext @X_EXTRA_LIBS@ + +DIR_CPPFLAGS = -I$(COMMON) -I$(TOP)/tx @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 |