GNOME.org
 

[gtk-vnc] Remove all gnulib code

commit 11cf43a1b8e39ef4d36d4c498a46f962ea0ee309
Author: Daniel P. Berrange <dan berrange com>
Date:   Wed Jul 14 13:51:39 2010 +0100

    Remove all gnulib code
    
    Since the port to use GIO for sockets, there is no requirement
    for gnulib. Delete it all

 Makefile.am                            |   12 +-
 bootstrap                              |   89 -
 build-aux/vc-list-files                |  107 -
 configure.ac                           |   11 +-
 gnulib/lib/Makefile.am                 |  607 ----
 gnulib/lib/alloca.in.h                 |   56 -
 gnulib/lib/arpa_inet.in.h              |   80 -
 gnulib/lib/asnprintf.c                 |   35 -
 gnulib/lib/dummy.c                     |   42 -
 gnulib/lib/errno.in.h                  |  153 -
 gnulib/lib/float+.h                    |  148 -
 gnulib/lib/float.in.h                  |   60 -
 gnulib/lib/gai_strerror.c              |   78 -
 gnulib/lib/getaddrinfo.c               |  419 ---
 gnulib/lib/getaddrinfo.h               |  163 --
 gnulib/lib/gettext.h                   |  270 --
 gnulib/lib/inet_ntop.c                 |  238 --
 gnulib/lib/malloc.c                    |   57 -
 gnulib/lib/netinet_in.in.h             |   45 -
 gnulib/lib/printf-args.c               |  187 --
 gnulib/lib/printf-args.h               |  154 -
 gnulib/lib/printf-parse.c              |  627 ----
 gnulib/lib/printf-parse.h              |  179 --
 gnulib/lib/size_max.h                  |   31 -
 gnulib/lib/snprintf.c                  |   72 -
 gnulib/lib/stdbool.in.h                |  119 -
 gnulib/lib/stdint.in.h                 |  523 ----
 gnulib/lib/stdio-write.c               |  148 -
 gnulib/lib/stdio.in.h                  |  475 ----
 gnulib/lib/stdlib.in.h                 |  242 --
 gnulib/lib/sys_socket.in.h             |  386 ---
 gnulib/lib/unistd.in.h                 |  388 ---
 gnulib/lib/vasnprintf.c                | 4887 --------------------------------
 gnulib/lib/vasnprintf.h                |   81 -
 gnulib/lib/wchar.in.h                  |   99 -
 gnulib/lib/winsock.c                   |  308 --
 gnulib/lib/xsize.h                     |  108 -
 gnulib/m4/alloca.m4                    |   46 -
 gnulib/m4/arpa_inet_h.m4               |   50 -
 gnulib/m4/errno_h.m4                   |  113 -
 gnulib/m4/extensions.m4                |   82 -
 gnulib/m4/float_h.m4                   |   19 -
 gnulib/m4/getaddrinfo.m4               |  130 -
 gnulib/m4/gnulib-cache.m4              |   43 -
 gnulib/m4/gnulib-common.m4             |   91 -
 gnulib/m4/gnulib-comp.m4               |  314 --
 gnulib/m4/gnulib-tool.m4               |   57 -
 gnulib/m4/include_next.m4              |  128 -
 gnulib/m4/inet_ntop.m4                 |   26 -
 gnulib/m4/intmax_t.m4                  |   61 -
 gnulib/m4/inttypes_h.m4                |   26 -
 gnulib/m4/longlong.m4                  |  106 -
 gnulib/m4/malloc.m4                    |   41 -
 gnulib/m4/netinet_in_h.m4              |   30 -
 gnulib/m4/onceonly.m4                  |   90 -
 gnulib/m4/printf.m4                    | 1309 ---------
 gnulib/m4/size_max.m4                  |   68 -
 gnulib/m4/snprintf.m4                  |   40 -
 gnulib/m4/socklen.m4                   |   52 -
 gnulib/m4/sockpfaf.m4                  |   58 -
 gnulib/m4/stdbool.m4                   |  115 -
 gnulib/m4/stdint.m4                    |  395 ---
 gnulib/m4/stdint_h.m4                  |   26 -
 gnulib/m4/stdio_h.m4                   |  125 -
 gnulib/m4/stdlib_h.m4                  |   47 -
 gnulib/m4/sys_socket_h.m4              |  113 -
 gnulib/m4/unistd_h.m4                  |   70 -
 gnulib/m4/vasnprintf.m4                |  260 --
 gnulib/m4/wchar.m4                     |   69 -
 gnulib/m4/wchar_t.m4                   |   20 -
 gnulib/m4/wint_t.m4                    |   28 -
 gnulib/m4/xsize.m4                     |   13 -
 gnulib/tests/Makefile.am               |  211 --
 gnulib/tests/dummy.c                   |   42 -
 gnulib/tests/intprops.h                |   77 -
 gnulib/tests/test-alloca-opt.c         |   62 -
 gnulib/tests/test-arpa_inet.c          |   27 -
 gnulib/tests/test-errno.c              |  117 -
 gnulib/tests/test-getaddrinfo.c        |  155 -
 gnulib/tests/test-netinet_in.c         |   27 -
 gnulib/tests/test-snprintf.c           |   72 -
 gnulib/tests/test-stdbool.c            |   95 -
 gnulib/tests/test-stdint.c             |  360 ---
 gnulib/tests/test-stdio.c              |   30 -
 gnulib/tests/test-stdlib.c             |   37 -
 gnulib/tests/test-sys_socket.c         |   47 -
 gnulib/tests/test-unistd.c             |   44 -
 gnulib/tests/test-vasnprintf.c         |  128 -
 gnulib/tests/test-vc-list-files-cvs.sh |   62 -
 gnulib/tests/test-vc-list-files-git.sh |   46 -
 gnulib/tests/test-wchar.c              |   31 -
 gnulib/tests/verify.h                  |  140 -
 po/POTFILES.in                         |    1 -
 src/Makefile.am                        |   14 +-
 94 files changed, 7 insertions(+), 17763 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 21c626e..a274aca 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,5 +1,5 @@
-SUBDIRS = gnulib/lib src tools examples plugin gnulib/tests po
-ACLOCAL_AMFLAGS = -I gnulib/m4 ${ACLOCAL_FLAGS}
+SUBDIRS = src tools examples plugin po
+ACLOCAL_AMFLAGS = ${ACLOCAL_FLAGS}
 
 pkgconfig_DATA = @PACKAGE -$(GTK_VNC_API_VERSION).pc gvnc-1.0.pc
 pkgconfigdir = $(libdir)/pkgconfig
@@ -37,14 +37,6 @@ MAINTAINERCLEANFILES = 		\
 	omf.make		\
 	py-compile		\
 	xmldocs.make		\
-	gnulib/m4/gnome-doc-utils.m4	\
-	gnulib/m4/gtk-doc.m4		\
-	gnulib/m4/intltool.m4		\
-	gnulib/m4/libtool.m4		\
-	gnulib/m4/ltoptions.m4		\
-	gnulib/m4/ltsugar.m4		\
-	gnulib/m4/ltversion.m4		\
-	gnulib/m4/lt~obsolete.m4	\
 	m4/libtool.m4			\
 	m4/lt~obsolete.m4		\
 	m4/ltoptions.m4			\
diff --git a/configure.ac b/configure.ac
index 7d074da..864b431 100644
--- a/configure.ac
+++ b/configure.ac
@@ -13,7 +13,7 @@ AM_INIT_AUTOMAKE([1.10 -Wno-portability])
 LT_PREREQ([2.2.6])
 LT_INIT([win32-dll disable-static])
 
-AC_CONFIG_MACRO_DIR([gnulib/m4])
+AC_CONFIG_MACRO_DIR([m4])
 
 GNOME_MAINTAINER_MODE_DEFINES
 
@@ -45,13 +45,6 @@ MOZILLA_PLUGIN_REQUIRED=1.8
 GOBJECT_INTROSPECTION_REQUIRED=0.6.2
 
 dnl *******************************************************************************
-dnl Setup GNULIB - must be before anything else in this file
-dnl *******************************************************************************
-
-gl_EARLY
-gl_INIT
-
-dnl *******************************************************************************
 dnl Setup core compilers / build helpers
 dnl *******************************************************************************
 
@@ -389,8 +382,6 @@ AM_CONDITIONAL([WITH_GOBJECT_INTROSPECTION], [test "x$enable_introspection" = "x
 
 AC_CONFIG_FILES(
   Makefile
-  gnulib/lib/Makefile
-  gnulib/tests/Makefile
   src/Makefile
   tools/Makefile
   examples/Makefile
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 88c014d..f2e11b8 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,2 +1 @@
-gnulib/lib/gai_strerror.c
 src/vncdisplay.c
diff --git a/src/Makefile.am b/src/Makefile.am
index 5c423c0..b59f8d3 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -27,8 +27,7 @@ libgvnc_1_0_la_LIBADD = \
 			@GTHREAD_LIBS@ \
 			@GDK_PIXBUF_LIBS@ \
 			@GNUTLS_LIBS@ \
-			@SASL_LIBS@ \
-			../gnulib/lib/libgnu.la
+			@SASL_LIBS@
 libgvnc_1_0_la_CFLAGS = \
 			@GOBJECT_CFLAGS@ \
 			@GIO_CFLAGS@ \
@@ -39,9 +38,7 @@ libgvnc_1_0_la_CFLAGS = \
 			@WARNING_CFLAGS@ \
 			-DSYSCONFDIR=\""$(sysconfdir)"\" \
 			-DPACKAGE_LOCALE_DIR=\""$(datadir)/locale"\" \
-			-DG_LOG_DOMAIN=\"gvnc\" \
-			-I$(top_srcdir)/gnulib/lib \
-			-I../gnulib/lib
+			-DG_LOG_DOMAIN=\"gvnc\"
 libgvnc_1_0_la_LDFLAGS = \
 			$(VERSION_SCRIPT_FLAGS)$(GVNC_VERSION_FILE) \
 			-version-info 0:1:0 $(NO_UNDEFINED_FLAGS)
@@ -84,17 +81,14 @@ endif
 gtk_vnc_LIBADD = \
 			@GTK_LIBS@ \
 			@X11_LIBS@ \
-			libgvnc-1.0.la \
-			../gnulib/lib/libgnu.la
+			libgvnc-1.0.la
 gtk_vnc_CFLAGS = \
 			@GTK_CFLAGS@ \
 			@X11_CFLAGS@ \
 			@WARNING_CFLAGS@ \
 			-DSYSCONFDIR=\""$(sysconfdir)"\" \
 			-DPACKAGE_LOCALE_DIR=\""$(datadir)/locale"\" \
-			-DG_LOG_DOMAIN=\"gtk-vnc\" \
-			-I$(top_srcdir)/gnulib/lib \
-			-I../gnulib/lib
+			-DG_LOG_DOMAIN=\"gtk-vnc\"
 
 gtk_vnc_includedir = $(includedir)/gtk-vnc-$(GTK_VNC_API_VERSION)/
 gtk_vnc_include_HEADERS = \
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]