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/os | |
| 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/os')
| -rw-r--r-- | common/os/Makefile.am | 3 | ||||
| -rw-r--r-- | common/os/net.c | 4 | ||||
| -rw-r--r-- | common/os/net.h | 8 | ||||
| -rw-r--r-- | common/os/print.c | 4 | ||||
| -rw-r--r-- | common/os/print.h | 8 |
5 files changed, 11 insertions, 16 deletions
diff --git a/common/os/Makefile.am b/common/os/Makefile.am index 3d892609..5e372906 100644 --- a/common/os/Makefile.am +++ b/common/os/Makefile.am @@ -3,3 +3,6 @@ noinst_LTLIBRARIES = libos.la HDRS = net.h print.h libos_la_SOURCES = $(HDRS) print.c net.c + +libos_la_CPPFLAGS = -I$(top_srcdir)/common + diff --git a/common/os/net.c b/common/os/net.c index 50ce8687..5c0ac2d3 100644 --- a/common/os/net.c +++ b/common/os/net.c @@ -16,8 +16,8 @@ * USA. */ -#ifdef HAVE_COMMON_CONFIG_H -#include <common-config.h> +#ifdef HAVE_CONFIG_H +#include <config.h> #endif #include <stdlib.h> diff --git a/common/os/net.h b/common/os/net.h index acaf50f5..bd8b21cc 100644 --- a/common/os/net.h +++ b/common/os/net.h @@ -19,12 +19,8 @@ #ifndef OS_NET_H #define OS_NET_H -#ifdef HAVE_COMMON_CONFIG_H -#include <common-config.h> -#endif - -#ifdef WIN32 -#include <common-config.win.h> +#ifdef HAVE_CONFIG_H +#include <config.h> #endif #ifdef __cplusplus diff --git a/common/os/print.c b/common/os/print.c index 0f26de36..4be22035 100644 --- a/common/os/print.c +++ b/common/os/print.c @@ -16,8 +16,8 @@ * USA. */ -#ifdef HAVE_COMMON_CONFIG_H -#include <common-config.h> +#ifdef HAVE_CONFIG_H +#include <config.h> #endif #include <os/print.h> diff --git a/common/os/print.h b/common/os/print.h index 523f3a1f..442dd642 100644 --- a/common/os/print.h +++ b/common/os/print.h @@ -19,12 +19,8 @@ #ifndef OS_PRINT_H #define OS_PRINT_H -#ifdef HAVE_COMMON_CONFIG_H -#include <common-config.h> -#endif - -#ifdef WIN32 -#include <common-config.win.h> +#ifdef HAVE_CONFIG_H +#include <config.h> #endif #include <stdarg.h> |