diff options
| author | Adam Tkac <atkac@redhat.com> | 2008-03-20 11:48:41 +0000 |
|---|---|---|
| committer | Adam Tkac <atkac@redhat.com> | 2008-03-20 11:48:41 +0000 |
| commit | ae2c6454d953f142efc02da285655b0451d86da0 (patch) | |
| tree | a48a2ab700c33f43c87a94c3804ef17b90d263d1 /common/network | |
| parent | d547e72eba2e44a3201f603fee66bd504db7b854 (diff) | |
| download | tigervnc-ae2c6454d953f142efc02da285655b0451d86da0.tar.gz tigervnc-ae2c6454d953f142efc02da285655b0451d86da0.zip | |
- use Makefile.am and configure.ac
- removed unwanted files
- internationalization and jpeg library doesn't work yet
git-svn-id: svn://svn.code.sf.net/p/tigervnc/code/branches/1.5-xserver@2433 3789f03b-4d11-0410-bbf8-ca57d06f2519
Diffstat (limited to 'common/network')
| -rw-r--r-- | common/network/Makefile.am | 5 | ||||
| -rw-r--r-- | common/network/Makefile.in | 17 | ||||
| -rw-r--r-- | common/network/TcpSocket.cxx | 4 |
3 files changed, 9 insertions, 17 deletions
diff --git a/common/network/Makefile.am b/common/network/Makefile.am new file mode 100644 index 00000000..a262d8fe --- /dev/null +++ b/common/network/Makefile.am @@ -0,0 +1,5 @@ +noinst_LTLIBRARIES = libnetwork.la + +libnetwork_la_SOURCES = Socket.h TcpSocket.cxx TcpSocket.h + +libnetwork_la_CPPFLAGS = -I$(COMMON_DIR) diff --git a/common/network/Makefile.in b/common/network/Makefile.in deleted file mode 100644 index 8aed303a..00000000 --- a/common/network/Makefile.in +++ /dev/null @@ -1,17 +0,0 @@ - -SRCS = TcpSocket.cxx - -OBJS = $(SRCS:.cxx=.o) - -DIR_CPPFLAGS = -I$(top_srcdir) @SOCKLEN_T_DEFINE@ - -library = libnetwork.a - -all:: $(library) - -$(library): $(OBJS) - rm -f $(library) - $(AR) $(library) $(OBJS) - $(RANLIB) $(library) - -# followed by boilerplate.mk diff --git a/common/network/TcpSocket.cxx b/common/network/TcpSocket.cxx index 5dd24287..c9c65780 100644 --- a/common/network/TcpSocket.cxx +++ b/common/network/TcpSocket.cxx @@ -16,6 +16,10 @@ * USA. */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif + #ifdef WIN32 //#include <io.h> #include <winsock2.h> |