From 4dafe799c1e27a1bd40be0ae67db3f96a72e05df Mon Sep 17 00:00:00 2001 From: "trelane@digitasaru.net" Date: Thu, 15 Oct 2009 22:18:20 -0500 Subject: [PATCH] * It now compiles. --- Makefile.am | 2 +- configure.ac | 4 ++-- src/graph.c | 3 ++- src/graphwidget.c | 4 ++-- src/graphwidget.h | 4 ++-- src/matdb-dotcode.c | 3 ++- src/matdb-dotcode.h | 2 +- src/matdb.c | 2 +- src/scdataviz.c | 9 +++++---- 9 files changed, 18 insertions(+), 15 deletions(-) diff --git a/Makefile.am b/Makefile.am index 713cffb..a2e3558 100644 --- a/Makefile.am +++ b/Makefile.am @@ -13,4 +13,4 @@ program_version.c: echo '";' >> program_version.c src_scdataviz_SOURCES = src/graph.c src/matdb.c src/scdataviz.c src/graphwidget.c src/matdb-dotcode.c program_version.c -LIBS += $(GLIB_LIBS) $(GIO_LIBS) $(GTK_LIBS) +LIBS += $(GLIB_LIBS) $(GIO_LIBS) $(GTK_LIBS) -lm diff --git a/configure.ac b/configure.ac index 39202e5..6a306b3 100644 --- a/configure.ac +++ b/configure.ac @@ -7,7 +7,7 @@ AC_CONFIG_MACRO_DIR([m4]) AC_PROG_CC AM_PROG_CC_C_O -PKG_CHECK_MODULES(GLIB, glib-2.0 >= 2.6, have_glib=true, have_glib=false) +PKG_CHECK_MODULES(GLIB, glib-2.0 >= 2.18, have_glib=true, have_glib=false) AC_SUBST(GLIB_CFLAGS) AC_SUBST(GLIB_LIBS) @@ -15,7 +15,7 @@ PKG_CHECK_MODULES(GIO, gio-2.0 >= 2.18, have_gio=true, have_gio=false) AC_SUBST(GIO_CFLAGS) AC_SUBST(GIO_LIBS) -PKG_CHECK_MODULES(GTK, gtk+-2.0 >= 3.1, have_gtk=true, have_gtk=false) +PKG_CHECK_MODULES(GTK, gtk+-2.0 >= 2.18, have_gtk=true, have_gtk=false) AC_SUBST(GTK_CFLAGS) AC_SUBST(GTK_LIBS) diff --git a/src/graph.c b/src/graph.c index 8a48b76..b0dfc40 100644 --- a/src/graph.c +++ b/src/graph.c @@ -26,12 +26,13 @@ along with this program. If not, see . ** at http://gnomejournal.org/article/34/writing-a--using-cairo-and-gtk28 ** Started on Thu Jul 17 10:51:32 2008 Johnny Q. Hacker -** Last update Thu Oct 15 21:37:21 2009 Johnny Q. Hacker +** Last update Thu Oct 15 21:51:41 2009 Johnny Q. Hacker */ #include #include #include +#include "config.h" #include "graph.h" #ifdef DEBUG diff --git a/src/graphwidget.c b/src/graphwidget.c index beba3c9..978cc3f 100644 --- a/src/graphwidget.c +++ b/src/graphwidget.c @@ -26,11 +26,11 @@ ** at http://gnomejournal.org/article/34/writing-a-widget-using-cairo-and-gtk28 ** Started on Thu Jul 17 10:51:32 2008 Johnny Q. Hacker -** Last update Thu Oct 8 17:13:50 2009 Johnny Q. Hacker +** Last update Thu Oct 15 21:53:34 2009 Johnny Q. Hacker */ -#include #include +#include "graphwidget.h" G_DEFINE_TYPE(GraphWidget, graph_widget, GTK_TYPE_DRAWING_AREA); diff --git a/src/graphwidget.h b/src/graphwidget.h index cb2e390..9f52b7c 100644 --- a/src/graphwidget.h +++ b/src/graphwidget.h @@ -23,14 +23,14 @@ along with this program. If not, see . ** Started on Thu Jul 17 10:51:32 2008 Johnny Q. Hacker -** Last update Thu Oct 8 14:28:34 2009 Johnny Q. Hacker +** Last update Thu Oct 15 22:16:50 2009 Johnny Q. Hacker */ #ifndef GRAPHWIDGET_H_ #define GRAPHWIDGET_H_ #include -#include +#include "graph.h" typedef struct _GraphWidget { GtkDrawingArea parent_instance; diff --git a/src/matdb-dotcode.c b/src/matdb-dotcode.c index df195fb..526e539 100644 --- a/src/matdb-dotcode.c +++ b/src/matdb-dotcode.c @@ -20,11 +20,12 @@ */ -#include #define _GNU_SOURCE #include #include #include +#include "config.h" +#include "matdb-dotcode.h" #ifdef DEBUG #undef DEBUG diff --git a/src/matdb-dotcode.h b/src/matdb-dotcode.h index ebe4719..4a023db 100644 --- a/src/matdb-dotcode.h +++ b/src/matdb-dotcode.h @@ -23,7 +23,7 @@ #ifndef MATDB_DOTCODE_H_ #define MATDB_DOTCODE_H_ -#include +#include "matdb.h" struct matdb* read_matdb_dotcode(const GString *name, int *err); diff --git a/src/matdb.c b/src/matdb.c index 644eb40..3cbc598 100644 --- a/src/matdb.c +++ b/src/matdb.c @@ -20,9 +20,9 @@ */ -#include #include #include +#include "matdb.h" static void print_property(gpointer key, gpointer value, gpointer user_data) { fprintf(stderr, "\t\t%s=%g:\n", (char*)key, *(double*)value); diff --git a/src/scdataviz.c b/src/scdataviz.c index 812cd26..68d6c74 100644 --- a/src/scdataviz.c +++ b/src/scdataviz.c @@ -24,14 +24,15 @@ along with this program. If not, see . ** Started on Thu Jul 17 11:03:27 2008 Johnny Q. Hacker -** Last update Thu Oct 8 19:13:57 2009 Johnny Q. Hacker +** Last update Thu Oct 15 21:51:34 2009 Johnny Q. Hacker */ -#include -#include -#include #include #include +#include +#include "config.h" +#include "matdb-dotcode.h" +#include "graphwidget.h" #define DEBUG_SHOW_ONLY_BOWED -- 1.7.9.5