[cairo-commit] roadster/src Makefile.am, 1.3, 1.4 databasewindow.c, 1.2, 1.3 datasetwindow.c, 1.2, 1.3 db.c, 1.5, 1.6 geometryset.c, 1.4, 1.5 gotowindow.c, 1.2, 1.3 gpsclient.c, 1.2, 1.3 gui.c, 1.1.1.1, 1.2 import.c, 1.5, 1.6 import_tiger.c, 1.7, 1.8 importwindow.c, 1.3, 1.4 layers.c, 1.4, 1.5 locationset.c, 1.3, 1.4 main.c, 1.3, 1.4 mainwindow.c, 1.4, 1.5 map.c, 1.7, 1.8 scenemanager.c, 1.4, 1.5 search.c, 1.2, 1.3 search_location.c, 1.3, 1.4 search_road.c, 1.5, 1.6 searchwindow.c, 1.4, 1.5 util.c, 1.2, 1.3 welcomewindow.c, 1.2, 1.3

Ian McIntosh commit at pdx.freedesktop.org
Wed Feb 23 09:22:09 PST 2005 

Committed by: ian

Update of /cvs/cairo/roadster/src
In directory gabe:/tmp/cvs-serv25182/src

Modified Files:
	Makefile.am databasewindow.c datasetwindow.c db.c 
	geometryset.c gotowindow.c gpsclient.c gui.c import.c 
	import_tiger.c importwindow.c layers.c locationset.c main.c 
	mainwindow.c map.c scenemanager.c search.c search_location.c 
	search_road.c searchwindow.c util.c welcomewindow.c 
Log Message:
        * Major build file cleanup by Nathan Fredrickson <nathan at silverorange.com>
        * All header files moved into src/
        * configure: Check for mysql and gpsd.


Index: Makefile.am
===================================================================
RCS file: /cvs/cairo/roadster/src/Makefile.am,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- Makefile.am	22 Feb 2005 17:12:27 -0000	1.3
+++ Makefile.am	23 Feb 2005 17:22:07 -0000	1.4
@@ -1,14 +1,18 @@
 ## Process this file with automake to produce Makefile.in
 
-## Created by Anjuta - will be overwritten
-## If you don't want it to overwrite it,
-## 	Please disable it in the Anjuta project configuration
-
-INCLUDES = \
-	$(GNOME_CFLAGS)\
-	 -I/usr/include/mysql
+NULL = 
 
-AM_CFLAGS = $(WARN_CFLAGS)
+INCLUDES= \
+	-DDATADIR=\"$(pkgdatadir)\" \
+	-DGNOMELOCALEDIR=\"$(datadir)/locale\" \
+	-DGNOMEICONDIR=\""$(datadir)/pixmaps"\" \
+	-I. \
+	$(GNOME_CFLAGS) \
+	$(CAIRO_CFLAGS) \
+	$(MYSQL_CFLAGS) \
+	$(GPSD_CFLAGS) \
+	$(ROADSTER_DISABLE_DEPRECATED) \
+	$(NULL)
 
 bin_PROGRAMS = roadster
 
@@ -36,10 +40,10 @@
 	scenemanager.c\
 	databasewindow.c
 
-roadster_LDFLAGS = \
-	 -L/usr/lib/mysql
-
-roadster_LDADD =  \
-	$(GNOME_LIBS)\
-	 -lcairo -lmysqlclient -lgps
+roadster_LDADD = \
+	$(GNOME_LIBS) \
+	$(CAIRO_LIBS) \
+	$(MYSQL_LIBS) \
+	$(GPSD_LIBS) \
+	$(NULL)
 

Index: databasewindow.c
===================================================================
RCS file: /cvs/cairo/roadster/src/databasewindow.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- databasewindow.c	22 Feb 2005 17:12:27 -0000	1.2
+++ databasewindow.c	23 Feb 2005 17:22:07 -0000	1.3
@@ -24,9 +24,9 @@
 #include <gtk/gtk.h>
 #include <glade/glade.h>
 
-#include "../include/db.h"
-#include "../include/gui.h"
-#include "../include/databasewindow.h"
+#include "db.h"
+#include "gui.h"
+#include "databasewindow.h"
 
 struct {
 	GtkDialog* m_pWindow;	

Index: datasetwindow.c
===================================================================
RCS file: /cvs/cairo/roadster/src/datasetwindow.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- datasetwindow.c	22 Feb 2005 17:12:27 -0000	1.2
+++ datasetwindow.c	23 Feb 2005 17:22:07 -0000	1.3
@@ -29,9 +29,9 @@
 
 #include <gnome.h>
 
-#include "../include/util.h"
-#include "../include/datasetwindow.h"
-#include "../include/mainwindow.h"
+#include "util.h"
+#include "datasetwindow.h"
+#include "mainwindow.h"
 
 #define DATASETLIST_COLUMN_ID			(0)
 #define DATASETLIST_COLUMN_NAME 		(1)

Index: db.c
===================================================================
RCS file: /cvs/cairo/roadster/src/db.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- db.c	22 Feb 2005 17:12:27 -0000	1.5
+++ db.c	23 Feb 2005 17:22:07 -0000	1.6
@@ -32,12 +32,12 @@
 #include <stdio.h>
 #include <string.h>
 
-#include "../include/db.h"
-#include "../include/mainwindow.h"
-#include "../include/geometryset.h"
-#include "../include/util.h"
-#include "../include/layers.h"
-#include "../include/locationset.h"
+#include "db.h"
+#include "mainwindow.h"
+#include "geometryset.h"
+#include "util.h"
+#include "layers.h"
+#include "locationset.h"
 
 /*
 Notes on the database:

Index: geometryset.c
===================================================================
RCS file: /cvs/cairo/roadster/src/geometryset.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- geometryset.c	22 Feb 2005 17:12:27 -0000	1.4
+++ geometryset.c	23 Feb 2005 17:22:07 -0000	1.5
@@ -28,9 +28,9 @@
 #include <gtk/gtk.h>
 #include <string.h>
 #include <stdlib.h>
-#include "../include/geometryset.h"
-#include "../include/map.h"
-#include "../include/util.h"
+#include "geometryset.h"
+#include "map.h"
+#include "util.h"
 
 GMemChunk* g_pPointChunkAllocator;		// chunk allocators to be shared by all geometrysets
 GMemChunk* g_pPointStringChunkAllocator;

Index: gotowindow.c
===================================================================
RCS file: /cvs/cairo/roadster/src/gotowindow.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- gotowindow.c	22 Feb 2005 17:12:27 -0000	1.2
+++ gotowindow.c	23 Feb 2005 17:22:07 -0000	1.3
@@ -23,10 +23,10 @@
  
 #include <glade/glade.h>
 #include <gnome.h>
-#include "../include/util.h"
-#include "../include/map.h"
-#include "../include/mainwindow.h"
-#include "../include/gotowindow.h"
+#include "util.h"
+#include "map.h"
+#include "mainwindow.h"
+#include "gotowindow.h"
 
 #define LOCATIONLIST_COLUMN_NAME 		(0)
 #define LOCATIONLIST_COLUMN_LOCATION 	(1)

Index: gpsclient.c
===================================================================
RCS file: /cvs/cairo/roadster/src/gpsclient.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- gpsclient.c	22 Feb 2005 17:12:27 -0000	1.2
+++ gpsclient.c	23 Feb 2005 17:22:07 -0000	1.3
@@ -23,7 +23,7 @@
  
 #include <gtk/gtk.h>
 #include <gps.h>	// gpslib
-#include "../include/gpsclient.h"
+#include "gpsclient.h"
 
 struct {
 	struct gps_data_t * m_pGPSConnection;

Index: gui.c
===================================================================
RCS file: /cvs/cairo/roadster/src/gui.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- gui.c	18 Feb 2005 04:22:51 -0000	1.1.1.1
+++ gui.c	23 Feb 2005 17:22:07 -0000	1.2
@@ -29,28 +29,28 @@
 
 #include <gnome.h>
 
-#include "../include/gui.h"
-#include "../include/map.h"
-#include "../include/util.h"
-#include "../include/db.h"
+#include "gui.h"
+#include "map.h"
+#include "util.h"
+#include "db.h"
 
-#include "../include/mainwindow.h"
-#include "../include/gotowindow.h"
-#include "../include/importwindow.h"
-#include "../include/datasetwindow.h"
-#include "../include/welcomewindow.h"
-#include "../include/searchwindow.h"
-#include "../include/databasewindow.h"
+#include "mainwindow.h"
+#include "gotowindow.h"
+#include "importwindow.h"
+#include "datasetwindow.h"
+#include "welcomewindow.h"
+#include "searchwindow.h"
+#include "databasewindow.h"
 
 void gui_init()
 {
 	GladeXML *pGladeXML;
 
 	// Load glade UI definition file and connect to callback functions	
-	pGladeXML = glade_xml_new (PACKAGE_DATA_DIR"/roadster/glade/roadster.glade", NULL, NULL);
+	pGladeXML = glade_xml_new (PACKAGE_DATA_DIR"/roadster.glade", NULL, NULL);
 	if(pGladeXML == NULL) {
 		// try source directory if user hasn't done a 'make install' (good for development, too!)
-		pGladeXML = glade_xml_new (PACKAGE_SOURCE_DIR"/roadster.glade", NULL, NULL);
+		pGladeXML = glade_xml_new (PACKAGE_SOURCE_DIR"/data/roadster.glade", NULL, NULL);
 
 		if(pGladeXML == NULL) {
 			g_message("can't find glade xml file");

Index: import.c
===================================================================
RCS file: /cvs/cairo/roadster/src/import.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- import.c	22 Feb 2005 17:33:14 -0000	1.5
+++ import.c	23 Feb 2005 17:22:07 -0000	1.6
@@ -26,10 +26,10 @@
 #include <string.h>
 #include <gtk/gtk.h>
 
-#include "../include/import.h"
-#include "../include/importwindow.h"
-#include "../include/import_tiger.h"
-#include "../include/db.h"
+#include "import.h"
+#include "importwindow.h"
+#include "import_tiger.h"
+#include "db.h"
 
 #include <gnome-vfs-2.0/libgnomevfs/gnome-vfs.h>
 

Index: import_tiger.c
===================================================================
RCS file: /cvs/cairo/roadster/src/import_tiger.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- import_tiger.c	22 Feb 2005 17:43:21 -0000	1.7
+++ import_tiger.c	23 Feb 2005 17:22:07 -0000	1.8
@@ -28,9 +28,9 @@
 #include <string.h>
 #include <gnome-vfs-2.0/libgnomevfs/gnome-vfs.h>
 
-#include "../include/util.h"
-#include "../include/import_tiger.h"
-#include "../include/importwindow.h"
+#include "util.h"
+#include "import_tiger.h"
+#include "importwindow.h"
 
 #define TIGER_RT1_LINE_LENGTH 				(230)
 #define TIGER_RT2_LINE_LENGTH				(210)

Index: importwindow.c
===================================================================
RCS file: /cvs/cairo/roadster/src/importwindow.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- importwindow.c	22 Feb 2005 17:12:27 -0000	1.3
+++ importwindow.c	23 Feb 2005 17:22:07 -0000	1.4
@@ -23,10 +23,10 @@
 
 #include <glade/glade.h>
 #include <gnome.h>
-#include "../include/db.h"
-#include "../include/import.h"
-#include "../include/mainwindow.h"
-#include "../include/importwindow.h"
+#include "db.h"
+#include "import.h"
+#include "mainwindow.h"
+#include "importwindow.h"
 
 //#define G_PROCESS_MAINLOOP  while(g_main_context_iteration(g_main_context_default(), FALSE)) { /* do nothing */ }
 // #define G_PROCESS_MAINLOOP  while(g_main_iteration(FALSE)) { /* do nothing */ }

Index: layers.c
===================================================================
RCS file: /cvs/cairo/roadster/src/layers.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- layers.c	22 Feb 2005 17:33:14 -0000	1.4
+++ layers.c	23 Feb 2005 17:22:07 -0000	1.5
@@ -22,7 +22,7 @@
  */
 
 #include <cairo.h>
-#include "../include/layers.h"
+#include "layers.h"
 
 gdouble pDash_Solid[] = {10};
 gdouble pDash_10_10[] = {1, 14};

Index: locationset.c
===================================================================
RCS file: /cvs/cairo/roadster/src/locationset.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- locationset.c	22 Feb 2005 17:12:27 -0000	1.3
+++ locationset.c	23 Feb 2005 17:22:07 -0000	1.4
@@ -23,9 +23,9 @@
 
 #include <stdlib.h>
 #include <gtk/gtk.h>
-#include "../include/locationset.h"
-#include "../include/db.h"
-#include "../include/util.h"
+#include "locationset.h"
+#include "db.h"
+#include "util.h"
 
 #define DB_LOCATIONS_TABLENAME		("Location")
 #define DB_LOCATIONSETS_TABLENAME	("LocationSet")

Index: main.c
===================================================================
RCS file: /cvs/cairo/roadster/src/main.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- main.c	23 Feb 2005 01:44:39 -0000	1.3
+++ main.c	23 Feb 2005 17:22:07 -0000	1.4
@@ -26,15 +26,15 @@
 #endif
 
 #include <gnome.h>
-#include "../include/gui.h"
-#include "../include/db.h"
-#include "../include/geometryset.h"
-#include "../include/mainwindow.h"
-#include "../include/map.h"
-#include "../include/import.h"
-#include "../include/gpsclient.h"
-#include "../include/locationset.h"
-#include "../include/scenemanager.h"
+#include "gui.h"
+#include "db.h"
+#include "geometryset.h"
+#include "mainwindow.h"
+#include "map.h"
+#include "import.h"
+#include "gpsclient.h"
+#include "locationset.h"
+#include "scenemanager.h"
 
 int main (int argc, char *argv[])
 {

Index: mainwindow.c
===================================================================
RCS file: /cvs/cairo/roadster/src/mainwindow.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- mainwindow.c	22 Feb 2005 17:12:27 -0000	1.4
+++ mainwindow.c	23 Feb 2005 17:22:07 -0000	1.5
@@ -27,23 +27,26 @@
 
 #include <gnome.h>
 
-#include "../include/search_road.h"
-#include "../include/gui.h"
-#include "../include/util.h"
-#include "../include/gotowindow.h"
-#include "../include/db.h"
-#include "../include/map.h"
-#include "../include/importwindow.h"
-#include "../include/datasetwindow.h"
-#include "../include/welcomewindow.h"
-#include "../include/locationset.h"
-#include "../include/gpsclient.h"
-#include "../include/databasewindow.h"
-#include "../include/mainwindow.h"
+#include "search_road.h"
+#include "gui.h"
+#include "util.h"
+#include "gotowindow.h"
+#include "db.h"
+#include "map.h"
+#include "importwindow.h"
+#include "datasetwindow.h"
+#include "welcomewindow.h"
+#include "locationset.h"
+#include "gpsclient.h"
+#include "databasewindow.h"
+#include "mainwindow.h"
 
 #include <gdk/gdkx.h>
 #include <cairo.h>
-#include <cairo-xlib.h>
+
+#ifdef HAVE_NEWER_CAIRO
+#  include <cairo-xlib.h>
+#endif
 
 #define PROGRAM_NAME		"Roadster"
 #define PROGRAM_COPYRIGHT	"Copyright (c) 2005 Ian McIntosh"

Index: map.c
===================================================================
RCS file: /cvs/cairo/roadster/src/map.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- map.c	23 Feb 2005 01:44:39 -0000	1.7
+++ map.c	23 Feb 2005 17:22:07 -0000	1.8
@@ -28,15 +28,15 @@
 
 #define HACK_AROUND_CAIRO_LINE_CAP_BUG
 
-#include "../include/gui.h"
-#include "../include/map.h"
-#include "../include/geometryset.h"
-#include "../include/mainwindow.h"
-#include "../include/util.h"
-#include "../include/db.h"
-#include "../include/layers.h"
-#include "../include/locationset.h"
-#include "../include/scenemanager.h"
+#include "gui.h"
+#include "map.h"
+#include "geometryset.h"
+#include "mainwindow.h"
+#include "util.h"
+#include "db.h"
+#include "layers.h"
+#include "locationset.h"
+#include "scenemanager.h"
 
 // 4,382,755 inches per degree
 // 363 inches of world represented in 3.63 inches

Index: scenemanager.c
===================================================================
RCS file: /cvs/cairo/roadster/src/scenemanager.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- scenemanager.c	23 Feb 2005 01:44:39 -0000	1.4
+++ scenemanager.c	23 Feb 2005 17:22:07 -0000	1.5
@@ -22,8 +22,8 @@
  */
 
 #include <gtk/gtk.h>
-#include "../include/geometryset.h"
-#include "../include/scenemanager.h"
+#include "geometryset.h"
+#include "scenemanager.h"
 
 /*
 Goals:

Index: search.c
===================================================================
RCS file: /cvs/cairo/roadster/src/search.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- search.c	22 Feb 2005 17:12:27 -0000	1.2
+++ search.c	23 Feb 2005 17:22:07 -0000	1.3
@@ -22,7 +22,7 @@
  */
  
 #include <gtk/gtk.h>
-#include "../include/search.h"
+#include "search.h"
 
 // functions common to all searches
 

Index: search_location.c
===================================================================
RCS file: /cvs/cairo/roadster/src/search_location.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- search_location.c	22 Feb 2005 17:12:27 -0000	1.3
+++ search_location.c	23 Feb 2005 17:22:07 -0000	1.4
@@ -23,11 +23,11 @@
 
 #include <stdlib.h>
 #include <gtk/gtk.h>
-#include "../include/db.h"
-#include "../include/util.h"
-#include "../include/search.h"
-#include "../include/searchwindow.h"
-#include "../include/search_location.h"
+#include "db.h"
+#include "util.h"
+#include "search.h"
+#include "searchwindow.h"
+#include "search_location.h"
 
 #define MAX_QUERY					(4000)
 #define SEARCH_RESULT_COUNT_LIMIT	(100)

Index: search_road.c
===================================================================
RCS file: /cvs/cairo/roadster/src/search_road.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- search_road.c	22 Feb 2005 17:12:27 -0000	1.5
+++ search_road.c	23 Feb 2005 17:22:07 -0000	1.6
@@ -25,12 +25,12 @@
 #include <math.h>
 #include <stdlib.h>
 
-#include "../include/db.h"
-#include "../include/util.h"
-#include "../include/geometryset.h"
-#include "../include/searchwindow.h"
-#include "../include/search.h"
-#include "../include/search_road.h"
+#include "db.h"
+#include "util.h"
+#include "geometryset.h"
+#include "searchwindow.h"
+#include "search.h"
+#include "search_road.h"
 
 typedef struct {
 	gint m_nNumber;			// house number	eg. 51

Index: searchwindow.c
===================================================================
RCS file: /cvs/cairo/roadster/src/searchwindow.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- searchwindow.c	22 Feb 2005 17:33:14 -0000	1.4
+++ searchwindow.c	23 Feb 2005 17:22:07 -0000	1.5
@@ -32,11 +32,11 @@
 
 #include <gnome.h>
 
-#include "../include/search_road.h"
-#include "../include/search_location.h"
-#include "../include/searchwindow.h"
-#include "../include/locationset.h"
-#include "../include/mainwindow.h"
+#include "search_road.h"
+#include "search_location.h"
+#include "searchwindow.h"
+#include "locationset.h"
+#include "mainwindow.h"
 
 static void fill_combobox_with_distance_unit_names(GtkComboBox* pComboBox)
 {

Index: util.c
===================================================================
RCS file: /cvs/cairo/roadster/src/util.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- util.c	22 Feb 2005 17:12:27 -0000	1.2
+++ util.c	23 Feb 2005 17:22:07 -0000	1.3
@@ -22,8 +22,8 @@
  */
 
 #include <stdlib.h> 
-#include "../include/util.h"
-#include "../include/layers.h"		// for color_t -- move it elsewhere!
+#include "util.h"
+#include "layers.h"		// for color_t -- move it elsewhere!
 
 void util_close_parent_window(GtkWidget* pWidget, gpointer data)
 {

Index: welcomewindow.c
===================================================================
RCS file: /cvs/cairo/roadster/src/welcomewindow.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- welcomewindow.c	22 Feb 2005 17:12:27 -0000	1.2
+++ welcomewindow.c	23 Feb 2005 17:22:07 -0000	1.3
@@ -28,8 +28,8 @@
 #endif
 
 #include <gnome.h>
-#include "../include/mainwindow.h"
-#include "../include/welcomewindow.h"
+#include "mainwindow.h"
+#include "welcomewindow.h"
 
 #define URL_CENSUS_GOV_TIGER_DATA_WEBSITE ("http://www.census.gov/geo/www/tiger/tiger2003/tgr2003.html")

More information about the cairo-commit mailing list