Remove gnulib, it's a huge pain
authorAndy Spencer <andy753421@gmail.com>
Wed, 2 Nov 2011 06:11:21 +0000 (06:11 +0000)
committerAndy Spencer <andy753421@gmail.com>
Wed, 2 Nov 2011 08:00:24 +0000 (08:00 +0000)
.gitignore
Makefile.am
configure.ac
gen-win32.sh
m4/01gnolib.m4 [deleted file]
src/Makefile.am
src/plugins/Makefile.am
src/plugins/alert.c
src/plugins/radar.c

index 20ab202..952b391 100644 (file)
@@ -7,9 +7,6 @@ pkg
 gtk-*/
 build/
 web/
-/arg-nonnull.h
-/c++defs.h
-/warn-on-use.h
 Makefile
 Makefile.in
 aclocal.m4
@@ -29,7 +26,6 @@ doltlibtool
 gmon.out
 gtk-doc.make
 install-sh
-lib
 libtool
 local
 ltmain.sh
index 6b237e4..5a748cb 100644 (file)
@@ -1,4 +1,4 @@
-SUBDIRS = data lib src docs
+SUBDIRS = data src docs
 
 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
 
-EXTRA_DIST = m4/gnulib-cache.m4
-
 test: all
        (cd src && make test)
 
index 2449421..f72e23d 100644 (file)
@@ -7,12 +7,10 @@ AC_CONFIG_MACRO_DIR([m4])
 
 # Check for required programs
 AC_PROG_CC
-gl_EARLY
 LT_PROG_RC
 AC_PROG_LIBTOOL
 DOLT
 PKG_PROG_PKG_CONFIG
-gl_INIT
 
 # 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
-       lib/Makefile
        src/Makefile
        src/resource.rc
        src/plugins/Makefile
index f9f3b59..2917923 100755 (executable)
@@ -1,5 +1,4 @@
 #!/bin/bash
-gnulib-tool --no-vc-files --import strptime
 
 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
+++ /dev/null
@@ -1,4 +0,0 @@
-AC_DEFUN([gl_EARLY], [])
-AC_DEFUN([gl_INIT], [])
-syscmd([mkdir -p lib/])
-syscmd([touch lib/Makefile.am])
index b72794b..fb2e6f5 100644 (file)
@@ -26,7 +26,6 @@ wsr88ddec_LDFLAGS     = -mwindows
 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)
index 55166a0..912bb46 100644 (file)
@@ -11,10 +11,8 @@ alert_la_SOURCES = \
        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
@@ -26,9 +24,8 @@ radar_la_SOURCES = \
        ../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
index d3a7018..379a45e 100644 (file)
@@ -16,7 +16,7 @@
  */
 
 
-#include <sys/time.h>
+#include <time.h>
 #include <grits.h>
 #include <GL/gl.h>
 #include <stdio.h>
index 0af1d92..8c4d969 100644 (file)
@@ -16,7 +16,7 @@
  */
 
 #define _XOPEN_SOURCE
-#include <sys/time.h>
+#include <time.h>
 #include <config.h>
 #include <glib/gstdio.h>
 #include <gtk/gtk.h>