From be5f29a7f5586a27ec2ac06abfb25a570b357f87 Mon Sep 17 00:00:00 2001 From: Andy Spencer Date: Thu, 6 Aug 2009 00:54:52 +0000 Subject: [PATCH] autotools broke itself.. --- Makefile.am | 2 + configure.ac | 1 + src/gis/Makefile.am | 11 +++- src/gis/gis-marshal.c | 127 ------------------------------------------ src/gis/gis-marshal.h | 28 ---------- 5 files changed, 13 insertions(+), 156 deletions(-) delete mode 100644 src/gis/gis-marshal.c delete mode 100644 src/gis/gis-marshal.h diff --git a/Makefile.am b/Makefile.am index 4b7dbe2..ab2db73 100644 --- a/Makefile.am +++ b/Makefile.am @@ -3,6 +3,8 @@ SUBDIRS = src data docs MAINTAINERCLEANFILES = aclocal.m4 compile config.guess config.h.in gtk-doc.make \ configure depcomp install-sh Makefile.in missing +ACLOCAL_AMFLAGS=-I m4 + test: all (cd src && make test) diff --git a/configure.ac b/configure.ac index 18311d7..39277d9 100644 --- a/configure.ac +++ b/configure.ac @@ -2,6 +2,7 @@ AC_INIT([aweather], [0.1.1], [spenceal@rose-hulman.edu]) AM_INIT_AUTOMAKE([-Wall -Werror -Wno-portability foreign]) AC_CONFIG_HEADERS([config.h]) +AC_CONFIG_MACRO_DIR([m4]) # Check for required programs AC_PROG_CC diff --git a/src/gis/Makefile.am b/src/gis/Makefile.am index dd2588a..97d8a39 100644 --- a/src/gis/Makefile.am +++ b/src/gis/Makefile.am @@ -2,10 +2,19 @@ AM_CFLAGS = -Wall -Werror -Wno-unused --std=gnu99 BUILT_SOURCES = gis-marshal.c gis-marshal.h lib_LTLIBRARIES = libgis.la +gis_includedir = $(includedir)/gis +gis_include_HEADERS = \ + gis.h \ + gis-world.h \ + gis-view.h \ + gis-prefs.h \ + gis-opengl.h \ + gis-plugin.h \ + gis-data.h libgis_la_SOURCES = \ - gis-prefs.c gis-prefs.h \ gis-world.c gis-world.h \ gis-view.c gis-view.h \ + gis-prefs.c gis-prefs.h \ gis-opengl.c gis-opengl.h \ gis-plugin.c gis-plugin.h \ gis-data.c gis-data.h \ diff --git a/src/gis/gis-marshal.c b/src/gis/gis-marshal.c deleted file mode 100644 index 23aa1db..0000000 --- a/src/gis/gis-marshal.c +++ /dev/null @@ -1,127 +0,0 @@ - -#include - - -#ifdef G_ENABLE_DEBUG -#define g_marshal_value_peek_boolean(v) g_value_get_boolean (v) -#define g_marshal_value_peek_char(v) g_value_get_char (v) -#define g_marshal_value_peek_uchar(v) g_value_get_uchar (v) -#define g_marshal_value_peek_int(v) g_value_get_int (v) -#define g_marshal_value_peek_uint(v) g_value_get_uint (v) -#define g_marshal_value_peek_long(v) g_value_get_long (v) -#define g_marshal_value_peek_ulong(v) g_value_get_ulong (v) -#define g_marshal_value_peek_int64(v) g_value_get_int64 (v) -#define g_marshal_value_peek_uint64(v) g_value_get_uint64 (v) -#define g_marshal_value_peek_enum(v) g_value_get_enum (v) -#define g_marshal_value_peek_flags(v) g_value_get_flags (v) -#define g_marshal_value_peek_float(v) g_value_get_float (v) -#define g_marshal_value_peek_double(v) g_value_get_double (v) -#define g_marshal_value_peek_string(v) (char*) g_value_get_string (v) -#define g_marshal_value_peek_param(v) g_value_get_param (v) -#define g_marshal_value_peek_boxed(v) g_value_get_boxed (v) -#define g_marshal_value_peek_pointer(v) g_value_get_pointer (v) -#define g_marshal_value_peek_object(v) g_value_get_object (v) -#else /* !G_ENABLE_DEBUG */ -/* WARNING: This code accesses GValues directly, which is UNSUPPORTED API. - * Do not access GValues directly in your code. Instead, use the - * g_value_get_*() functions - */ -#define g_marshal_value_peek_boolean(v) (v)->data[0].v_int -#define g_marshal_value_peek_char(v) (v)->data[0].v_int -#define g_marshal_value_peek_uchar(v) (v)->data[0].v_uint -#define g_marshal_value_peek_int(v) (v)->data[0].v_int -#define g_marshal_value_peek_uint(v) (v)->data[0].v_uint -#define g_marshal_value_peek_long(v) (v)->data[0].v_long -#define g_marshal_value_peek_ulong(v) (v)->data[0].v_ulong -#define g_marshal_value_peek_int64(v) (v)->data[0].v_int64 -#define g_marshal_value_peek_uint64(v) (v)->data[0].v_uint64 -#define g_marshal_value_peek_enum(v) (v)->data[0].v_long -#define g_marshal_value_peek_flags(v) (v)->data[0].v_ulong -#define g_marshal_value_peek_float(v) (v)->data[0].v_float -#define g_marshal_value_peek_double(v) (v)->data[0].v_double -#define g_marshal_value_peek_string(v) (v)->data[0].v_pointer -#define g_marshal_value_peek_param(v) (v)->data[0].v_pointer -#define g_marshal_value_peek_boxed(v) (v)->data[0].v_pointer -#define g_marshal_value_peek_pointer(v) (v)->data[0].v_pointer -#define g_marshal_value_peek_object(v) (v)->data[0].v_pointer -#endif /* !G_ENABLE_DEBUG */ - - -/* VOID:DOUBLE,DOUBLE,DOUBLE (gis-marshal.list:1) */ -void -gis_cclosure_marshal_VOID__DOUBLE_DOUBLE_DOUBLE (GClosure *closure, - GValue *return_value G_GNUC_UNUSED, - guint n_param_values, - const GValue *param_values, - gpointer invocation_hint G_GNUC_UNUSED, - gpointer marshal_data) -{ - typedef void (*GMarshalFunc_VOID__DOUBLE_DOUBLE_DOUBLE) (gpointer data1, - gdouble arg_1, - gdouble arg_2, - gdouble arg_3, - gpointer data2); - register GMarshalFunc_VOID__DOUBLE_DOUBLE_DOUBLE callback; - register GCClosure *cc = (GCClosure*) closure; - register gpointer data1, data2; - - g_return_if_fail (n_param_values == 4); - - if (G_CCLOSURE_SWAP_DATA (closure)) - { - data1 = closure->data; - data2 = g_value_peek_pointer (param_values + 0); - } - else - { - data1 = g_value_peek_pointer (param_values + 0); - data2 = closure->data; - } - callback = (GMarshalFunc_VOID__DOUBLE_DOUBLE_DOUBLE) (marshal_data ? marshal_data : cc->callback); - - callback (data1, - g_marshal_value_peek_double (param_values + 1), - g_marshal_value_peek_double (param_values + 2), - g_marshal_value_peek_double (param_values + 3), - data2); -} - -/* VOID:STRING,UINT,POINTER (gis-marshal.list:2) */ -void -gis_cclosure_marshal_VOID__STRING_UINT_POINTER (GClosure *closure, - GValue *return_value G_GNUC_UNUSED, - guint n_param_values, - const GValue *param_values, - gpointer invocation_hint G_GNUC_UNUSED, - gpointer marshal_data) -{ - typedef void (*GMarshalFunc_VOID__STRING_UINT_POINTER) (gpointer data1, - gpointer arg_1, - guint arg_2, - gpointer arg_3, - gpointer data2); - register GMarshalFunc_VOID__STRING_UINT_POINTER callback; - register GCClosure *cc = (GCClosure*) closure; - register gpointer data1, data2; - - g_return_if_fail (n_param_values == 4); - - if (G_CCLOSURE_SWAP_DATA (closure)) - { - data1 = closure->data; - data2 = g_value_peek_pointer (param_values + 0); - } - else - { - data1 = g_value_peek_pointer (param_values + 0); - data2 = closure->data; - } - callback = (GMarshalFunc_VOID__STRING_UINT_POINTER) (marshal_data ? marshal_data : cc->callback); - - callback (data1, - g_marshal_value_peek_string (param_values + 1), - g_marshal_value_peek_uint (param_values + 2), - g_marshal_value_peek_pointer (param_values + 3), - data2); -} - diff --git a/src/gis/gis-marshal.h b/src/gis/gis-marshal.h deleted file mode 100644 index ca695bf..0000000 --- a/src/gis/gis-marshal.h +++ /dev/null @@ -1,28 +0,0 @@ - -#ifndef __gis_cclosure_marshal_MARSHAL_H__ -#define __gis_cclosure_marshal_MARSHAL_H__ - -#include - -G_BEGIN_DECLS - -/* VOID:DOUBLE,DOUBLE,DOUBLE (gis-marshal.list:1) */ -extern void gis_cclosure_marshal_VOID__DOUBLE_DOUBLE_DOUBLE (GClosure *closure, - GValue *return_value, - guint n_param_values, - const GValue *param_values, - gpointer invocation_hint, - gpointer marshal_data); - -/* VOID:STRING,UINT,POINTER (gis-marshal.list:2) */ -extern void gis_cclosure_marshal_VOID__STRING_UINT_POINTER (GClosure *closure, - GValue *return_value, - guint n_param_values, - const GValue *param_values, - gpointer invocation_hint, - gpointer marshal_data); - -G_END_DECLS - -#endif /* __gis_cclosure_marshal_MARSHAL_H__ */ - -- 2.43.2