diff options
| author | Adam Tkac <atkac@redhat.com> | 2008-04-17 16:17:12 +0000 |
|---|---|---|
| committer | Adam Tkac <atkac@redhat.com> | 2008-04-17 16:17:12 +0000 |
| commit | 81e616ed06b8f72ade348fcd4502efbb3b470297 (patch) | |
| tree | 87bcf5cff2d532287e5ea29bee1f8a822cc6fb34 /unix/vncconfig | |
| parent | 932e09b4b9e452cd230fa91f2200d5cb0785e34f (diff) | |
| download | tigervnc-81e616ed06b8f72ade348fcd4502efbb3b470297.tar.gz tigervnc-81e616ed06b8f72ade348fcd4502efbb3b470297.zip | |
- 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
Diffstat (limited to 'unix/vncconfig')
| -rw-r--r-- | unix/vncconfig/Makefile.am | 9 | ||||
| -rw-r--r-- | unix/vncconfig/Makefile.in | 24 |
2 files changed, 9 insertions, 24 deletions
diff --git a/unix/vncconfig/Makefile.am b/unix/vncconfig/Makefile.am new file mode 100644 index 00000000..0ae7e257 --- /dev/null +++ b/unix/vncconfig/Makefile.am @@ -0,0 +1,9 @@ +bin_PROGRAMS = vncconfig + +vncconfig_SOURCES = vncExt.c vncconfig.cxx QueryConnectDialog.cxx buildtime.c + +vncconfig_CPPFLAGS = -I$(COMMON_DIR) -I$(top_srcdir)/tx @X_CFLAGS@ # X_CFLAGS are really CPPFLAGS + +vncconfig_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@ -lX11 -lXext @X_EXTRA_LIBS@ diff --git a/unix/vncconfig/Makefile.in b/unix/vncconfig/Makefile.in deleted file mode 100644 index 527a79ed..00000000 --- a/unix/vncconfig/Makefile.in +++ /dev/null @@ -1,24 +0,0 @@ - -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 |