Remove gnulib, it's a huge pain

diff --git a/.gitignore b/.gitignore
index 20ab202206514d592c3d8628f8d755e622120058..952b391205f072a464cadc3d05bf3a0b22ff8a69 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -7,9 +7,6 @@ pkg
 gtk-*/
 build/
 web/
 gtk-*/
 build/
 web/

-/arg-nonnull.h
-/c++defs.h
-/warn-on-use.h

 Makefile
 Makefile.in
 aclocal.m4
 Makefile
 Makefile.in
 aclocal.m4


@@ -29,7 +26,6 @@ doltlibtool
 gmon.out
 gtk-doc.make
 install-sh
 gmon.out
 gtk-doc.make
 install-sh

-lib

 libtool
 local
 ltmain.sh
 libtool
 local
 ltmain.sh

diff --git a/Makefile.am b/Makefile.am
index 6b237e4d1c5dfff1e30ea421061677440a2919c9..5a748cbaa1ea4d20512e1374e60d29784c64ccf7 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS = data lib src docs
+SUBDIRS = data src docs

 
 ACLOCAL_AMFLAGS = -I m4
 
 
 ACLOCAL_AMFLAGS = -I m4
 


@@ -6,8 +6,6 @@ MAINTAINERCLEANFILES = aclocal.m4 compile config.guess config.h.in config.sub \
                       configure depcomp gtk-doc.make install-sh ltmain.sh \
                       Makefile.in missing
 
                       configure depcomp gtk-doc.make install-sh ltmain.sh \
                       Makefile.in missing
 

-EXTRA_DIST = m4/gnulib-cache.m4
-

 test: all
        (cd src && make test)
 
 test: all
        (cd src && make test)
 

diff --git a/configure.ac b/configure.ac
index 24494211ef3ef4881314480aa688647b1480c2ef..f72e23dcbc5ff424993261a85e716fc3010e7883 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -7,12 +7,10 @@ AC_CONFIG_MACRO_DIR([m4])
 
 # Check for required programs
 AC_PROG_CC
 
 # Check for required programs
 AC_PROG_CC

-gl_EARLY

 LT_PROG_RC
 AC_PROG_LIBTOOL
 DOLT
 PKG_PROG_PKG_CONFIG
 LT_PROG_RC
 AC_PROG_LIBTOOL
 DOLT
 PKG_PROG_PKG_CONFIG

-gl_INIT

 
 # Check for required packages
 PKG_CHECK_MODULES(GLIB,  glib-2.0)
 
 # Check for required packages
 PKG_CHECK_MODULES(GLIB,  glib-2.0)


@@ -36,7 +34,6 @@ AM_CONDITIONAL([WIN32], test "$WIN32" = "yes")
 # Output 
 AC_CONFIG_FILES([
        Makefile
 # Output 
 AC_CONFIG_FILES([
        Makefile

-       lib/Makefile

        src/Makefile
        src/resource.rc
        src/plugins/Makefile
        src/Makefile
        src/resource.rc
        src/plugins/Makefile

diff --git a/gen-win32.sh b/gen-win32.sh
index f9f3b593a209f6c378d777f4ce2c3fabf50849c2..2917923e0e33ce4e53bc638ecd4c6f6d781da467 100755 (executable)
--- a/gen-win32.sh
+++ b/gen-win32.sh
@@ -1,5 +1,4 @@
 #!/bin/bash
 #!/bin/bash

-gnulib-tool --no-vc-files --import strptime

 
 GRITS="/scratch/grits-win32/src"
 export PKG_CONFIG_PATH="$GRITS"
 
 GRITS="/scratch/grits-win32/src"
 export PKG_CONFIG_PATH="$GRITS"

diff --git a/m4/01gnolib.m4 b/m4/01gnolib.m4
deleted file mode 100644 (file)
index 394b73a..0000000
--- a/m4/01gnolib.m4
+++ /dev/null
@@ -1,4 +0,0 @@
-AC_DEFUN([gl_EARLY], [])
-AC_DEFUN([gl_INIT], [])
-syscmd([mkdir -p lib/])
-syscmd([touch lib/Makefile.am])

diff --git a/src/Makefile.am b/src/Makefile.am
index b72794b611c36888c3401567e652f5414e5592ae..fb2e6f5e4cc42e34a9a4a5f9e21fd8635fbadd8c 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -26,7 +26,6 @@ wsr88ddec_LDFLAGS     = -mwindows
 aweather_SOURCES     += resource.rc
 aweather_LDFLAGS      = -mwindows
 aweather_CPPFLAGS    += -I$(top_srcdir)/lib
 aweather_SOURCES     += resource.rc
 aweather_LDFLAGS      = -mwindows
 aweather_CPPFLAGS    += -I$(top_srcdir)/lib

-aweather_LDADD       += $(top_srcdir)/lib/libgnu.la

 
 bin_PROGRAMS         += aweather-dbg
 aweather_dbg_SOURCES  = $(aweather_SOURCES)
 
 bin_PROGRAMS         += aweather-dbg
 aweather_dbg_SOURCES  = $(aweather_SOURCES)

diff --git a/src/plugins/Makefile.am b/src/plugins/Makefile.am
index 55166a05e72d011c627a2d4eec59f7ac4f7a4721..912bb46160111adc5a4ef675c0fa291de5f8bb3c 100644 (file)
--- a/src/plugins/Makefile.am
+++ b/src/plugins/Makefile.am
@@ -11,10 +11,8 @@ alert_la_SOURCES = \
        alert.c      alert.h \
        alert-info.c alert-info.h
 alert_la_CPPFLAGS = \
        alert.c      alert.h \
        alert-info.c alert-info.h
 alert_la_CPPFLAGS = \

-       -DPKGDATADIR="\"$(dots)$(pkgdatadir)\"" \
-       -I$(top_srcdir)/lib
-alert_la_LIBADD  = $(GRITS_LIBS) \
-                  $(addprefix $(top_srcdir)/lib/,$(gl_LTLIBOBJS))
+       -DPKGDATADIR="\"$(dots)$(pkgdatadir)\""
+alert_la_LIBADD  = $(GRITS_LIBS)

 
 if HAVE_RSL
 plugins_LTLIBRARIES += radar.la
 
 if HAVE_RSL
 plugins_LTLIBRARIES += radar.la


@@ -26,9 +24,8 @@ radar_la_SOURCES = \
        ../aweather-location.h
 radar_la_CPPFLAGS = \
        -DPKGDATADIR="\"$(dots)$(pkgdatadir)\"" \
        ../aweather-location.h
 radar_la_CPPFLAGS = \
        -DPKGDATADIR="\"$(dots)$(pkgdatadir)\"" \

-       -I$(top_srcdir)/src -I$(top_srcdir)/lib
-radar_la_LIBADD  = $(RSL_LIBS) $(GRITS_LIBS) \
-                  $(addprefix $(top_srcdir)/lib/,$(gl_LTLIBOBJS))
+       -I$(top_srcdir)/src
+radar_la_LIBADD  = $(RSL_LIBS) $(GRITS_LIBS)

 endif
 
 if WIN32
 endif
 
 if WIN32

diff --git a/src/plugins/alert.c b/src/plugins/alert.c
index d3a7018b516b86080a62991395f3e5f9c5065877..379a45e297e0d19128ae291118ac5ba5c653af69 100644 (file)
--- a/src/plugins/alert.c
+++ b/src/plugins/alert.c
@@ -16,7 +16,7 @@
  */
 
 
  */
 
 

-#include <sys/time.h>
+#include <time.h>

 #include <grits.h>
 #include <GL/gl.h>
 #include <stdio.h>
 #include <grits.h>
 #include <GL/gl.h>
 #include <stdio.h>

diff --git a/src/plugins/radar.c b/src/plugins/radar.c
index 0af1d92d8be29679b08e7f64ce2063826ac8bf19..8c4d96934719e9fc62512914af620bc6c163fe50 100644 (file)
--- a/src/plugins/radar.c
+++ b/src/plugins/radar.c
@@ -16,7 +16,7 @@
  */
 
 #define _XOPEN_SOURCE
  */
 
 #define _XOPEN_SOURCE

-#include <sys/time.h>
+#include <time.h>

 #include <config.h>
 #include <glib/gstdio.h>
 #include <gtk/gtk.h>
 #include <config.h>
 #include <glib/gstdio.h>
 #include <gtk/gtk.h>