diff options
| author | Adam Tkac <atkac@redhat.com> | 2009-09-04 12:08:56 +0000 |
|---|---|---|
| committer | Adam Tkac <atkac@redhat.com> | 2009-09-04 12:08:56 +0000 |
| commit | 8aee1a8c9dea78b60bdaf2485be4e85ed48d905f (patch) | |
| tree | ce87dcec024847a6fff934bd244156d728942dfd /common/rdr | |
| parent | 771d6a05da7880d7daf32c66d5880c15a55b6f75 (diff) | |
| download | tigervnc-8aee1a8c9dea78b60bdaf2485be4e85ed48d905f.tar.gz tigervnc-8aee1a8c9dea78b60bdaf2485be4e85ed48d905f.zip | |
- use unix/configure.ac as top-level configure.ac base
- create stub top-level Makefile.am
- make common/ subtree compilable
git-svn-id: svn://svn.code.sf.net/p/tigervnc/code/branches/unified_buildsys@3892 3789f03b-4d11-0410-bbf8-ca57d06f2519
Diffstat (limited to 'common/rdr')
| -rw-r--r-- | common/rdr/FdInStream.cxx | 4 | ||||
| -rw-r--r-- | common/rdr/FdOutStream.cxx | 4 | ||||
| -rw-r--r-- | common/rdr/Makefile.am | 6 |
3 files changed, 7 insertions, 7 deletions
diff --git a/common/rdr/FdInStream.cxx b/common/rdr/FdInStream.cxx index e2281b49..adb14c50 100644 --- a/common/rdr/FdInStream.cxx +++ b/common/rdr/FdInStream.cxx @@ -16,8 +16,8 @@ * USA. */ -#ifdef HAVE_COMMON_CONFIG_H -#include <common-config.h> +#ifdef HAVE_CONFIG_H +#include <config.h> #endif #include <stdio.h> diff --git a/common/rdr/FdOutStream.cxx b/common/rdr/FdOutStream.cxx index c771166e..c84c946f 100644 --- a/common/rdr/FdOutStream.cxx +++ b/common/rdr/FdOutStream.cxx @@ -16,8 +16,8 @@ * USA. */ -#ifdef HAVE_COMMON_CONFIG_H -#include <common-config.h> +#ifdef HAVE_CONFIG_H +#include <config.h> #endif #include <stdio.h> diff --git a/common/rdr/Makefile.am b/common/rdr/Makefile.am index e9a01c10..589ad809 100644 --- a/common/rdr/Makefile.am +++ b/common/rdr/Makefile.am @@ -9,10 +9,10 @@ librdr_la_SOURCES = $(HDRS) Exception.cxx FdInStream.cxx FdOutStream.cxx \ InStream.cxx RandomStream.cxx ZlibInStream.cxx ZlibOutStream.cxx \ HexInStream.cxx HexOutStream.cxx -librdr_la_CPPFLAGS = -I$(top_srcdir) +librdr_la_CPPFLAGS = -I$(top_srcdir)/common librdr_la_LIBADD = if INCLUDED_ZLIB -librdr_la_CPPFLAGS += -I$(top_srcdir)/zlib -librdr_la_LIBADD += $(top_srcdir)/zlib/libz.la +librdr_la_CPPFLAGS += -I$(top_srcdir)/common/zlib +librdr_la_LIBADD += $(top_srcdir)/common/zlib/libz.la endif |