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 /common/network | |
| 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 '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, 17 insertions, 9 deletions
diff --git a/common/network/Makefile.am b/common/network/Makefile.am deleted file mode 100644 index a262d8fe..00000000 --- a/common/network/Makefile.am +++ /dev/null @@ -1,5 +0,0 @@ -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 new file mode 100644 index 00000000..8aed303a --- /dev/null +++ b/common/network/Makefile.in @@ -0,0 +1,17 @@ + +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 c9c65780..5dd24287 100644 --- a/common/network/TcpSocket.cxx +++ b/common/network/TcpSocket.cxx @@ -16,10 +16,6 @@ * USA. */ -#ifdef HAVE_CONFIG_H -#include <config.h> -#endif - #ifdef WIN32 //#include <io.h> #include <winsock2.h> |