[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]
gEDA-cvs: branch: master updated (1.1.2.20070818-160-g52bb24c)
The branch, master has been updated
via 52bb24c3868d14b12480037dc8f0b1450cc78d7f (commit)
via 8fd1e724fbb7f9b2e109a829c700daf11521c08a (commit)
via 39454be8d19bc73e3fb4b4a688a93ddc411d01c0 (commit)
via 559caed6b573a19f287fb0f1b35e46726acf9631 (commit)
from 0a5ba355c6719172ec1e6325108d5c0e716d1a2e (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
=========
Summary
=========
gschem/src/g_register.c | 4 ---
libgeda/include/Makefile.am | 2 +
libgeda/include/libgeda_priv.h | 19 +++++++++++++
libgeda/src/Makefile.am | 58 +++++++++++++++++++++++++++++++--------
libgeda/src/a_basic.c | 11 +-------
libgeda/src/f_basic.c | 8 +-----
libgeda/src/f_print.c | 12 +-------
libgeda/src/g_basic.c | 10 +------
libgeda/src/g_rc.c | 22 +++------------
libgeda/src/g_register.c | 11 +-------
libgeda/src/g_smob.c | 9 +-----
libgeda/src/i_vars.c | 13 +--------
libgeda/src/libgeda.c | 22 ++++-----------
libgeda/src/m_basic.c | 9 +-----
libgeda/src/o_arc_basic.c | 12 +-------
libgeda/src/o_attrib.c | 13 +--------
libgeda/src/o_basic.c | 11 +-------
libgeda/src/o_box_basic.c | 12 +-------
libgeda/src/o_bus_basic.c | 12 +-------
libgeda/src/o_circle_basic.c | 14 +---------
libgeda/src/o_complex_basic.c | 12 +-------
libgeda/src/o_embed.c | 12 +-------
libgeda/src/o_line_basic.c | 13 +--------
libgeda/src/o_list.c | 11 +-------
libgeda/src/o_net_basic.c | 12 +-------
libgeda/src/o_picture.c | 9 +-----
libgeda/src/o_pin_basic.c | 12 +-------
libgeda/src/o_selection.c | 14 +---------
libgeda/src/o_text_basic.c | 12 +-------
libgeda/src/s_attrib.c | 9 +-----
libgeda/src/s_basic.c | 12 +-------
libgeda/src/s_clib.c | 12 +-------
libgeda/src/s_color.c | 9 +-----
libgeda/src/s_conn.c | 12 +-------
libgeda/src/s_cue.c | 12 +-------
libgeda/src/s_hierarchy.c | 13 +--------
libgeda/src/s_log.c | 12 +-------
libgeda/src/s_menu.c | 9 +-----
libgeda/src/s_page.c | 13 +--------
libgeda/src/s_papersizes.c | 9 +-----
libgeda/src/s_slib.c | 9 +-----
libgeda/src/s_stretch.c | 12 +-------
libgeda/src/s_textbuffer.c | 11 +-------
libgeda/src/s_tile.c | 12 +-------
libgeda/src/s_toplevel.c | 12 +-------
libgeda/src/s_undo.c | 12 +-------
libgeda/src/u_basic.c | 9 +-----
47 files changed, 118 insertions(+), 472 deletions(-)
create mode 100644 libgeda/include/libgeda_priv.h
=================
Commit Messages
=================
commit 52bb24c3868d14b12480037dc8f0b1450cc78d7f
Author: Peter TB Brett <peter@xxxxxxxxxxxxx>
Date: Fri Dec 21 17:26:30 2007 +0000
libgeda: Make sure that Guile smobs are initialised.
Rather than initialising them in gschem, which is a WTF.
:100644 100644 d4d68e4... 1e7a89f... M gschem/src/g_register.c
:100644 100644 22d9c31... 6dccb01... M libgeda/src/libgeda.c
commit 8fd1e724fbb7f9b2e109a829c700daf11521c08a
Author: Peter TB Brett <peter@xxxxxxxxxxxxx>
Date: Fri Dec 21 17:26:30 2007 +0000
libgeda: Now we assume GLib 2.4+, use g_setenv().
:100644 100644 0a391db... 50b4c99... M libgeda/src/g_rc.c
:100644 100644 3003971... 22d9c31... M libgeda/src/libgeda.c
commit 39454be8d19bc73e3fb4b4a688a93ddc411d01c0
Author: Peter TB Brett <peter@xxxxxxxxxxxxx>
Date: Fri Dec 21 17:26:29 2007 +0000
libgeda: Compile C files in alphabetical order.
Purely because it looks nicer.
:100644 100644 3015c90... bfab3ba... M libgeda/src/Makefile.am
commit 559caed6b573a19f287fb0f1b35e46726acf9631
Author: Peter TB Brett <peter@xxxxxxxxxxxxx>
Date: Fri Dec 21 17:26:29 2007 +0000
libgeda: Add a private counterpart to libgeda.h for internal use
Provide a single header file, libgeda_priv.h, which includes all
libgeda headers and their dependency headers in the correct order.
Change libgeda C files to include just this header rather than all the
individual headers explicitly. This will make it easier to split out
the libgeda headers into public and private declarations.
:100644 100644 8357985... 0caf8c7... M libgeda/include/Makefile.am
:000000 100644 0000000... d979bd5... A libgeda/include/libgeda_priv.h
:100644 100644 6bfa546... 74e7675... M libgeda/src/a_basic.c
:100644 100644 6ba69e6... 5e15131... M libgeda/src/f_basic.c
:100644 100644 2660ddd... 19d62f6... M libgeda/src/f_print.c
:100644 100644 2af1a3d... 059550f... M libgeda/src/g_basic.c
:100644 100644 e061272... 0a391db... M libgeda/src/g_rc.c
:100644 100644 795f061... b3807a2... M libgeda/src/g_register.c
:100644 100644 24f4fc3... 644e874... M libgeda/src/g_smob.c
:100644 100644 e767656... 33275f5... M libgeda/src/i_vars.c
:100644 100644 5647d9a... 3003971... M libgeda/src/libgeda.c
:100644 100644 2a2b466... 82c5944... M libgeda/src/m_basic.c
:100644 100644 c0c4a13... 0553c35... M libgeda/src/o_arc_basic.c
:100644 100644 077c8c5... 47607bb... M libgeda/src/o_attrib.c
:100644 100644 513d0a9... d7f9974... M libgeda/src/o_basic.c
:100644 100644 ffe91e2... ddb1e84... M libgeda/src/o_box_basic.c
:100644 100644 91a5905... 37affd1... M libgeda/src/o_bus_basic.c
:100644 100644 d161989... bf8b0a7... M libgeda/src/o_circle_basic.c
:100644 100644 2d25300... 5e9f270... M libgeda/src/o_complex_basic.c
:100644 100644 0681477... 5d5c355... M libgeda/src/o_embed.c
:100644 100644 5cd6e90... 8f8b917... M libgeda/src/o_line_basic.c
:100644 100644 685f909... 9bdce9d... M libgeda/src/o_list.c
:100644 100644 869c359... c7ec0a5... M libgeda/src/o_net_basic.c
:100644 100644 0835676... 6dea434... M libgeda/src/o_picture.c
:100644 100644 7b2cb68... 0d1b7d1... M libgeda/src/o_pin_basic.c
:100644 100644 a7ce5e3... 33795b7... M libgeda/src/o_selection.c
:100644 100644 36dcea1... 9065c40... M libgeda/src/o_text_basic.c
:100644 100644 f1d68fd... 8eca8f4... M libgeda/src/s_attrib.c
:100644 100644 ea51309... b7ae70b... M libgeda/src/s_basic.c
:100644 100644 e604a19... 2158e68... M libgeda/src/s_clib.c
:100644 100644 f6fe17a... c3028b8... M libgeda/src/s_color.c
:100644 100644 9ebd32b... 9cb3d73... M libgeda/src/s_conn.c
:100644 100644 45f1ee6... 82fa4d9... M libgeda/src/s_cue.c
:100644 100644 b7295e5... 1b6a02d... M libgeda/src/s_hierarchy.c
:100644 100644 401080b... d28f3eb... M libgeda/src/s_log.c
:100644 100644 9b52767... 3bc3974... M libgeda/src/s_menu.c
:100644 100644 89ce467... b6c7398... M libgeda/src/s_page.c
:100644 100644 2b04324... d2369f7... M libgeda/src/s_papersizes.c
:100644 100644 2892c93... ea96161... M libgeda/src/s_slib.c
:100644 100644 ef0d25c... f2fa8a7... M libgeda/src/s_stretch.c
:100644 100644 dccb806... 4b0fd5c... M libgeda/src/s_textbuffer.c
:100644 100644 2ab714d... b22654e... M libgeda/src/s_tile.c
:100644 100644 75101c6... dac7bac... M libgeda/src/s_toplevel.c
:100644 100644 4238afd... 791bcb8... M libgeda/src/s_undo.c
:100644 100644 743a3fa... 7b2ed4b... M libgeda/src/u_basic.c
=========
Changes
=========
commit 52bb24c3868d14b12480037dc8f0b1450cc78d7f
Author: Peter TB Brett <peter@xxxxxxxxxxxxx>
Date: Fri Dec 21 17:26:30 2007 +0000
libgeda: Make sure that Guile smobs are initialised.
Rather than initialising them in gschem, which is a WTF.
diff --git a/gschem/src/g_register.c b/gschem/src/g_register.c
index d4d68e4..1e7a89f 100644
--- a/gschem/src/g_register.c
+++ b/gschem/src/g_register.c
@@ -327,10 +327,6 @@ void g_register_funcs (void)
tmp++;
}
- g_init_attrib_smob ();
- g_init_object_smob ();
- g_init_page_smob ();
-
/* Hook stuff */
scm_c_define_gsubr ("add-attribute-to-object", 5, 0, 0, g_add_attrib);
scm_c_define_gsubr ("get-object-attributes", 1, 0, 0, g_get_object_attributes);
diff --git a/libgeda/src/libgeda.c b/libgeda/src/libgeda.c
index 22d9c31..6dccb01 100644
--- a/libgeda/src/libgeda.c
+++ b/libgeda/src/libgeda.c
@@ -64,6 +64,10 @@ void libgeda_init(void)
g_register_libgeda_funcs();
g_register_libgeda_vars();
+
+ g_init_object_smob();
+ g_init_attrib_smob();
+ g_init_page_smob();
}
commit 8fd1e724fbb7f9b2e109a829c700daf11521c08a
Author: Peter TB Brett <peter@xxxxxxxxxxxxx>
Date: Fri Dec 21 17:26:30 2007 +0000
libgeda: Now we assume GLib 2.4+, use g_setenv().
diff --git a/libgeda/src/g_rc.c b/libgeda/src/g_rc.c
index 0a391db..50b4c99 100644
--- a/libgeda/src/g_rc.c
+++ b/libgeda/src/g_rc.c
@@ -359,16 +359,13 @@ void g_rc_parse(TOPLEVEL *toplevel,
{
gint found_rc = 0;
char *rc_path;
- char *geda_rcdata;
/* set the GEDADATARC environment variable so that the rc files */
/* know where to look for others */
rc_path = f_normalize_filename (g_rc_parse_path ());
- /* Reversion to putenv inspired by W. Hoch, 2.17.2005 */
- /* g_setenv ("GEDADATARC", rc_path, TRUE); */ /*requires glib 2.4.x*/
- geda_rcdata = g_strdup_printf("GEDADATARC=%s", rc_path);
- putenv(geda_rcdata);
- g_free(rc_path);
+
+ g_setenv ("GEDADATARC", rc_path, TRUE);
+ g_free (rc_path);
/* visit rc files in order */
/* Changed by SDB 1.2.2005 in response to Peter Kaiser's bug report.
diff --git a/libgeda/src/libgeda.c b/libgeda/src/libgeda.c
index 3003971..22d9c31 100644
--- a/libgeda/src/libgeda.c
+++ b/libgeda/src/libgeda.c
@@ -46,17 +46,10 @@
*/
void libgeda_init(void)
{
- char *new_data=NULL;
char *geda_data = getenv("GEDADATA");
- /* This stuff reverted on 2.17.2005 by SDB in response to W. Hoch. */
if (geda_data == NULL) {
- new_data = g_strdup_printf("GEDADATA=%s", GEDADATADIR);
- putenv(new_data);
- /*free(new_data); putenv takes over the memory on some OSes, do not free */
-
- /* We'll use this someday. . . . . */
- /* g_setenv ("GEDADATA", GEDADATADIR, FALSE); */ /* requires glib-2.4.* */
+ g_setenv ("GEDADATA", GEDADATADIR, FALSE);
}
g_type_init ();
commit 39454be8d19bc73e3fb4b4a688a93ddc411d01c0
Author: Peter TB Brett <peter@xxxxxxxxxxxxx>
Date: Fri Dec 21 17:26:29 2007 +0000
libgeda: Compile C files in alphabetical order.
Purely because it looks nicer.
diff --git a/libgeda/src/Makefile.am b/libgeda/src/Makefile.am
index 3015c90..bfab3ba 100644
--- a/libgeda/src/Makefile.am
+++ b/libgeda/src/Makefile.am
@@ -13,18 +13,52 @@ endif
lib_LTLIBRARIES = libgeda.la
libgeda_la_SOURCES = \
- a_basic.c f_basic.c f_print.c g_basic.c m_basic.c \
- o_arc_basic.c o_attrib.c o_basic.c o_box_basic.c \
- o_circle_basic.c o_complex_basic.c o_line_basic.c o_list.c \
- o_net_basic.c o_selection.c o_bus_basic.c o_text_basic.c \
- o_pin_basic.c o_embed.c \
- u_basic.c s_attrib.c s_basic.c \
- s_clib.c s_encoding.c s_hierarchy.c s_papersizes.c s_stretch.c \
- s_log.c s_textbuffer.c \
- s_page.c s_slib.c s_color.c s_undo.c s_conn.c \
- s_cue.c s_tile.c s_menu.c s_toplevel.c g_smob.c libgeda.c \
- g_register.c g_rc.c i_vars.c o_picture.c gdk-pixbuf-hacks.c \
- geda_list.c
+ a_basic.c \
+ f_basic.c \
+ f_print.c \
+ g_basic.c \
+ g_rc.c \
+ g_register.c \
+ g_smob.c \
+ gdk-pixbuf-hacks.c \
+ geda_list.c \
+ i_vars.c \
+ libgeda.c \
+ m_basic.c \
+ o_arc_basic.c \
+ o_attrib.c \
+ o_basic.c \
+ o_box_basic.c \
+ o_bus_basic.c \
+ o_circle_basic.c \
+ o_complex_basic.c \
+ o_embed.c \
+ o_line_basic.c \
+ o_list.c \
+ o_net_basic.c \
+ o_picture.c \
+ o_pin_basic.c \
+ o_selection.c \
+ o_text_basic.c \
+ s_attrib.c \
+ s_basic.c \
+ s_clib.c \
+ s_color.c \
+ s_conn.c \
+ s_cue.c \
+ s_encoding.c \
+ s_hierarchy.c \
+ s_log.c \
+ s_menu.c \
+ s_page.c \
+ s_papersizes.c \
+ s_slib.c \
+ s_stretch.c \
+ s_textbuffer.c \
+ s_tile.c \
+ s_toplevel.c \
+ s_undo.c \
+ u_basic.c
INCLUDES = -I$(top_srcdir)/include @LIBGEDA_CFLAGS@
libgeda_la_LDFLAGS = @LIBTOOL_FLAGS@ @LIBGEDA_LDFLAGS@
commit 559caed6b573a19f287fb0f1b35e46726acf9631
Author: Peter TB Brett <peter@xxxxxxxxxxxxx>
Date: Fri Dec 21 17:26:29 2007 +0000
libgeda: Add a private counterpart to libgeda.h for internal use
Provide a single header file, libgeda_priv.h, which includes all
libgeda headers and their dependency headers in the correct order.
Change libgeda C files to include just this header rather than all the
individual headers explicitly. This will make it easier to split out
the libgeda headers into public and private declarations.
diff --git a/libgeda/include/Makefile.am b/libgeda/include/Makefile.am
index 8357985..0caf8c7 100644
--- a/libgeda/include/Makefile.am
+++ b/libgeda/include/Makefile.am
@@ -6,6 +6,8 @@ libgedainclude_HEADERS = \
prototype.h struct.h libgeda.h i_vars.h papersizes.h \
geda_list.h
+noinst_HEADERS = libgeda_priv.h
+
MOSTLYCLEANFILES = *.log core FILE *~
CLEANFILES = *.log core FILE *~
DISTCLEANFILES = *.log core FILE *~ prototype.bak
diff --git a/libgeda/include/libgeda_priv.h b/libgeda/include/libgeda_priv.h
new file mode 100644
index 0000000..d979bd5
--- /dev/null
+++ b/libgeda/include/libgeda_priv.h
@@ -0,0 +1,19 @@
+/* System headers which libgeda headers rely on */
+#include <glib.h>
+#include <gtk/gtk.h> /* FIXME */
+#include <libguile.h>
+
+/* Public libgeda headers */
+#include "defines.h"
+#include "struct.h"
+#include "globals.h"
+#include "o_types.h"
+#include "colors.h"
+#include "i_vars.h"
+#include "papersizes.h"
+#include "prototype.h"
+#include "funcs.h"
+
+#include "geda_list.h"
+
+/* Private libgeda headers */
diff --git a/libgeda/src/a_basic.c b/libgeda/src/a_basic.c
index 6bfa546..74e7675 100644
--- a/libgeda/src/a_basic.c
+++ b/libgeda/src/a_basic.c
@@ -24,16 +24,7 @@
#include <string.h>
#endif
-#include <gtk/gtk.h>
-#include <libguile.h>
-
-#include "defines.h"
-#include "struct.h"
-#include "globals.h"
-#include "o_types.h"
-#include "colors.h"
-
-#include "../include/prototype.h"
+#include "libgeda_priv.h"
#ifdef HAVE_LIBDMALLOC
#include <dmalloc.h>
diff --git a/libgeda/src/f_basic.c b/libgeda/src/f_basic.c
index 6ba69e6..5e15131 100644
--- a/libgeda/src/f_basic.c
+++ b/libgeda/src/f_basic.c
@@ -35,17 +35,11 @@
#include <sys/types.h>
#include <sys/stat.h>
-#include <gtk/gtk.h>
-#include <libguile.h>
#ifdef HAVE_STRING_H
#include <string.h>
#endif
-#include "defines.h"
-#include "struct.h"
-#include "globals.h"
-
-#include "../include/prototype.h"
+#include "libgeda_priv.h"
#ifdef HAVE_LIBDMALLOC
#include <dmalloc.h>
diff --git a/libgeda/src/f_print.c b/libgeda/src/f_print.c
index 2660ddd..19d62f6 100644
--- a/libgeda/src/f_print.c
+++ b/libgeda/src/f_print.c
@@ -24,17 +24,7 @@
#include <time.h>
#include <math.h>
-#include <gtk/gtk.h>
-#include <libguile.h>
-
-#include "defines.h"
-#include "struct.h"
-#include "globals.h"
-#include "o_types.h"
-#include "funcs.h"
-#include "colors.h"
-
-#include "../include/prototype.h"
+#include "libgeda_priv.h"
/*! \brief Hashtable storing mapping between character and
* postscript glyph name
diff --git a/libgeda/src/g_basic.c b/libgeda/src/g_basic.c
index 2af1a3d..059550f 100644
--- a/libgeda/src/g_basic.c
+++ b/libgeda/src/g_basic.c
@@ -29,15 +29,7 @@
#include <unistd.h>
#endif
-#include <gtk/gtk.h>
-#include <libguile.h>
-
-#include "defines.h"
-#include "struct.h"
-#include "globals.h"
-#include "o_types.h"
-
-#include "../include/prototype.h"
+#include "libgeda_priv.h"
#ifdef HAVE_LIBDMALLOC
#include <dmalloc.h>
diff --git a/libgeda/src/g_rc.c b/libgeda/src/g_rc.c
index e061272..0a391db 100644
--- a/libgeda/src/g_rc.c
+++ b/libgeda/src/g_rc.c
@@ -35,18 +35,7 @@
#include <unistd.h>
#endif
-#include <gtk/gtk.h>
-#include <libguile.h>
-
-#include "defines.h"
-#include "struct.h"
-#include "globals.h"
-#include "o_types.h"
-#include "colors.h"
-
-#include "../include/i_vars.h"
-#include "../include/papersizes.h"
-#include "../include/prototype.h"
+#include "libgeda_priv.h"
#ifdef HAVE_LIBDMALLOC
#include <dmalloc.h>
diff --git a/libgeda/src/g_register.c b/libgeda/src/g_register.c
index 795f061..b3807a2 100644
--- a/libgeda/src/g_register.c
+++ b/libgeda/src/g_register.c
@@ -29,16 +29,7 @@
#include <unistd.h>
#endif
-#include <gtk/gtk.h>
-#include <libguile.h>
-
-#include "defines.h"
-#include "struct.h"
-#include "globals.h"
-#include "o_types.h"
-#include "colors.h"
-#include "i_vars.h"
-#include "prototype.h"
+#include "libgeda_priv.h"
#ifdef HAVE_LIBDMALLOC
#include <dmalloc.h>
diff --git a/libgeda/src/g_smob.c b/libgeda/src/g_smob.c
index 24f4fc3..644e874 100644
--- a/libgeda/src/g_smob.c
+++ b/libgeda/src/g_smob.c
@@ -25,14 +25,7 @@
#include <string.h>
#endif
-#include <gtk/gtk.h>
-#include <libguile.h>
-
-#include "defines.h"
-#include "struct.h"
-#include "globals.h"
-
-#include "../include/prototype.h"
+#include "libgeda_priv.h"
#ifdef HAVE_LIBDMALLOC
#include <dmalloc.h>
diff --git a/libgeda/src/i_vars.c b/libgeda/src/i_vars.c
index e767656..33275f5 100644
--- a/libgeda/src/i_vars.c
+++ b/libgeda/src/i_vars.c
@@ -20,18 +20,7 @@
#include <config.h>
#include <stdio.h>
-#include <gtk/gtk.h>
-#include <libguile.h>
-
-#include "defines.h"
-#include "struct.h"
-#include "globals.h"
-#include "o_types.h"
-#include "colors.h"
-#include "papersizes.h"
-#include "i_vars.h"
-
-#include "../include/prototype.h"
+#include "libgeda_priv.h"
#ifdef HAVE_LIBDMALLOC
#include <dmalloc.h>
diff --git a/libgeda/src/libgeda.c b/libgeda/src/libgeda.c
index 5647d9a..3003971 100644
--- a/libgeda/src/libgeda.c
+++ b/libgeda/src/libgeda.c
@@ -31,14 +31,7 @@
#include <stdlib.h>
#endif
-#include <gtk/gtk.h>
-#include <libguile.h>
-
-#include "defines.h"
-#include "struct.h"
-#include "globals.h"
-
-#include "../include/prototype.h"
+#include "libgeda_priv.h"
#ifdef HAVE_LIBDMALLOC
#include <dmalloc.h>
diff --git a/libgeda/src/m_basic.c b/libgeda/src/m_basic.c
index 2a2b466..82c5944 100644
--- a/libgeda/src/m_basic.c
+++ b/libgeda/src/m_basic.c
@@ -22,14 +22,7 @@
#include <stdio.h>
#include <math.h>
-#include <gtk/gtk.h>
-#include <libguile.h>
-
-#include "defines.h"
-#include "struct.h" /* why should I include these hack, just for prototype ? */
-#include "globals.h"
-
-#include "../include/prototype.h"
+#include "libgeda_priv.h"
#ifdef HAVE_LIBDMALLOC
#include <dmalloc.h>
diff --git a/libgeda/src/o_arc_basic.c b/libgeda/src/o_arc_basic.c
index c0c4a13..0553c35 100644
--- a/libgeda/src/o_arc_basic.c
+++ b/libgeda/src/o_arc_basic.c
@@ -22,17 +22,7 @@
#include <stdio.h>
#include <math.h>
-#include <gtk/gtk.h>
-#include <libguile.h>
-
-#include "defines.h"
-#include "struct.h"
-#include "globals.h"
-#include "o_types.h"
-#include "colors.h"
-#include "funcs.h"
-
-#include "../include/prototype.h"
+#include "libgeda_priv.h"
#ifdef HAVE_LIBDMALLOC
#include <dmalloc.h>
diff --git a/libgeda/src/o_attrib.c b/libgeda/src/o_attrib.c
index 077c8c5..47607bb 100644
--- a/libgeda/src/o_attrib.c
+++ b/libgeda/src/o_attrib.c
@@ -25,18 +25,7 @@
#endif
#include <math.h>
-#include <gtk/gtk.h>
-#include <libguile.h>
-
-#include "defines.h"
-#include "struct.h"
-#include "globals.h"
-#include "o_types.h"
-#include "colors.h"
-
-#include "geda_list.h"
-
-#include "../include/prototype.h"
+#include "libgeda_priv.h"
#ifdef HAVE_LIBDMALLOC
#include <dmalloc.h>
diff --git a/libgeda/src/o_basic.c b/libgeda/src/o_basic.c
index 513d0a9..d7f9974 100644
--- a/libgeda/src/o_basic.c
+++ b/libgeda/src/o_basic.c
@@ -27,16 +27,7 @@
#include <unistd.h>
#endif
-#include <gtk/gtk.h>
-#include <libguile.h>
-
-#include "defines.h"
-#include "struct.h"
-#include "globals.h"
-#include "o_types.h"
-#include "colors.h"
-
-#include "../include/prototype.h"
+#include "libgeda_priv.h"
#ifdef HAVE_LIBDMALLOC
#include <dmalloc.h>
diff --git a/libgeda/src/o_box_basic.c b/libgeda/src/o_box_basic.c
index ffe91e2..ddb1e84 100644
--- a/libgeda/src/o_box_basic.c
+++ b/libgeda/src/o_box_basic.c
@@ -21,17 +21,7 @@
#include <math.h>
#include <stdio.h>
-#include <gtk/gtk.h>
-#include <libguile.h>
-
-#include "defines.h"
-#include "struct.h"
-#include "globals.h"
-#include "o_types.h"
-#include "colors.h"
-#include "funcs.h"
-
-#include "../include/prototype.h"
+#include "libgeda_priv.h"
#ifdef HAVE_LIBDMALLOC
#include <dmalloc.h>
diff --git a/libgeda/src/o_bus_basic.c b/libgeda/src/o_bus_basic.c
index 91a5905..37affd1 100644
--- a/libgeda/src/o_bus_basic.c
+++ b/libgeda/src/o_bus_basic.c
@@ -25,17 +25,7 @@
#include <stdio.h>
#include <math.h>
-#include <gtk/gtk.h>
-#include <libguile.h>
-
-#include "defines.h"
-#include "struct.h"
-#include "globals.h"
-#include "o_types.h"
-#include "colors.h"
-#include "funcs.h"
-
-#include "../include/prototype.h"
+#include "libgeda_priv.h"
#ifdef HAVE_LIBDMALLOC
#include <dmalloc.h>
diff --git a/libgeda/src/o_circle_basic.c b/libgeda/src/o_circle_basic.c
index d161989..bf8b0a7 100644
--- a/libgeda/src/o_circle_basic.c
+++ b/libgeda/src/o_circle_basic.c
@@ -21,19 +21,7 @@
#include <stdio.h>
#include <math.h>
-#include <gtk/gtk.h>
-#include <libguile.h>
-
-
-#include "defines.h"
-#include "struct.h"
-#include "globals.h"
-#include "o_types.h"
-
-#include "colors.h"
-#include "funcs.h"
-
-#include "../include/prototype.h"
+#include "libgeda_priv.h"
#ifdef HAVE_LIBDMALLOC
#include <dmalloc.h>
diff --git a/libgeda/src/o_complex_basic.c b/libgeda/src/o_complex_basic.c
index 2d25300..5e9f270 100644
--- a/libgeda/src/o_complex_basic.c
+++ b/libgeda/src/o_complex_basic.c
@@ -28,17 +28,7 @@
#include <unistd.h>
#endif
-#include <gtk/gtk.h>
-#include <libguile.h>
-
-#include "defines.h"
-#include "struct.h"
-#include "globals.h"
-#include "o_types.h"
-#include "colors.h"
-#include "funcs.h"
-
-#include "../include/prototype.h"
+#include "libgeda_priv.h"
#ifdef HAVE_LIBDMALLOC
#include <dmalloc.h>
diff --git a/libgeda/src/o_embed.c b/libgeda/src/o_embed.c
index 0681477..5d5c355 100644
--- a/libgeda/src/o_embed.c
+++ b/libgeda/src/o_embed.c
@@ -21,19 +21,9 @@
#include <stdio.h>
-#include <gtk/gtk.h>
-#include <libguile.h>
-
#include <libgen.h>
-#include "defines.h"
-#include "struct.h"
-#include "globals.h"
-#include "o_types.h"
-#include "funcs.h"
-#include "colors.h"
-
-#include "../include/prototype.h"
+#include "libgeda_priv.h"
#ifdef HAVE_LIBDMALLOC
#include <dmalloc.h>
diff --git a/libgeda/src/o_line_basic.c b/libgeda/src/o_line_basic.c
index 5cd6e90..8f8b917 100644
--- a/libgeda/src/o_line_basic.c
+++ b/libgeda/src/o_line_basic.c
@@ -22,18 +22,7 @@
#include <stdio.h>
#include <math.h>
-#include <gtk/gtk.h>
-#include <libguile.h>
-
-
-#include "defines.h"
-#include "struct.h"
-#include "globals.h"
-#include "o_types.h"
-#include "colors.h"
-#include "funcs.h"
-
-#include "../include/prototype.h"
+#include "libgeda_priv.h"
#ifdef HAVE_LIBDMALLOC
#include <dmalloc.h>
diff --git a/libgeda/src/o_list.c b/libgeda/src/o_list.c
index 685f909..9bdce9d 100644
--- a/libgeda/src/o_list.c
+++ b/libgeda/src/o_list.c
@@ -24,16 +24,7 @@
#include <string.h>
#endif
-#include <gtk/gtk.h>
-#include <libguile.h>
-
-#include "defines.h"
-#include "struct.h"
-#include "globals.h"
-#include "o_types.h"
-#include "colors.h"
-
-#include "../include/prototype.h"
+#include "libgeda_priv.h"
#ifdef HAVE_LIBDMALLOC
#include <dmalloc.h>
diff --git a/libgeda/src/o_net_basic.c b/libgeda/src/o_net_basic.c
index 869c359..c7ec0a5 100644
--- a/libgeda/src/o_net_basic.c
+++ b/libgeda/src/o_net_basic.c
@@ -22,17 +22,7 @@
#include <stdio.h>
#include <math.h>
-#include <gtk/gtk.h>
-#include <libguile.h>
-
-#include "defines.h"
-#include "struct.h"
-#include "globals.h"
-#include "o_types.h"
-#include "colors.h"
-#include "funcs.h"
-
-#include "../include/prototype.h"
+#include "libgeda_priv.h"
#ifdef HAVE_LIBDMALLOC
#include <dmalloc.h>
diff --git a/libgeda/src/o_picture.c b/libgeda/src/o_picture.c
index 0835676..6dea434 100644
--- a/libgeda/src/o_picture.c
+++ b/libgeda/src/o_picture.c
@@ -33,14 +33,7 @@
#include <gdk-pixbuf/gdk-pixdata.h>
-#include "defines.h"
-#include "struct.h"
-#include "globals.h"
-#include "o_types.h"
-#include "colors.h"
-#include "funcs.h"
-
-#include "../include/prototype.h"
+#include "libgeda_priv.h"
/*! \brief Create picture OBJECT from character string.
* \par Function Description
diff --git a/libgeda/src/o_pin_basic.c b/libgeda/src/o_pin_basic.c
index 7b2cb68..0d1b7d1 100644
--- a/libgeda/src/o_pin_basic.c
+++ b/libgeda/src/o_pin_basic.c
@@ -22,17 +22,7 @@
#include <stdio.h>
#include <math.h>
-#include <gtk/gtk.h>
-#include <libguile.h>
-
-#include "defines.h"
-#include "struct.h"
-#include "globals.h"
-#include "o_types.h"
-#include "colors.h"
-#include "funcs.h"
-
-#include "../include/prototype.h"
+#include "libgeda_priv.h"
#ifdef HAVE_LIBDMALLOC
#include <dmalloc.h>
diff --git a/libgeda/src/o_selection.c b/libgeda/src/o_selection.c
index a7ce5e3..33795b7 100644
--- a/libgeda/src/o_selection.c
+++ b/libgeda/src/o_selection.c
@@ -28,19 +28,7 @@
#include <stdarg.h>
#endif
-#include <gtk/gtk.h>
-#include <libguile.h>
-
-#include "defines.h"
-#include "struct.h"
-#include "defines.h"
-#include "globals.h"
-#include "o_types.h"
-#include "colors.h"
-
-#include "geda_list.h"
-
-#include "../include/prototype.h"
+#include "libgeda_priv.h"
#ifdef HAVE_LIBDMALLOC
#include <dmalloc.h>
diff --git a/libgeda/src/o_text_basic.c b/libgeda/src/o_text_basic.c
index 36dcea1..9065c40 100644
--- a/libgeda/src/o_text_basic.c
+++ b/libgeda/src/o_text_basic.c
@@ -29,17 +29,7 @@
#include <unistd.h>
#endif
-#include <gtk/gtk.h>
-#include <libguile.h>
-
-#include "defines.h"
-#include "struct.h"
-#include "globals.h"
-#include "o_types.h"
-#include "colors.h"
-#include "funcs.h"
-
-#include "../include/prototype.h"
+#include "libgeda_priv.h"
#ifdef HAVE_LIBDMALLOC
#include <dmalloc.h>
diff --git a/libgeda/src/s_attrib.c b/libgeda/src/s_attrib.c
index f1d68fd..8eca8f4 100644
--- a/libgeda/src/s_attrib.c
+++ b/libgeda/src/s_attrib.c
@@ -28,14 +28,7 @@
#include <string.h>
#endif
-#include <gtk/gtk.h>
-#include <libguile.h>
-
-#include "defines.h"
-#include "struct.h"
-#include "globals.h"
-
-#include "../include/prototype.h"
+#include "libgeda_priv.h"
#ifdef HAVE_LIBDMALLOC
#include <dmalloc.h>
diff --git a/libgeda/src/s_basic.c b/libgeda/src/s_basic.c
index ea51309..b7ae70b 100644
--- a/libgeda/src/s_basic.c
+++ b/libgeda/src/s_basic.c
@@ -31,17 +31,7 @@
#include <string.h>
#endif
-#include <gtk/gtk.h>
-#include <libguile.h>
-
-#include "defines.h"
-#include "struct.h"
-#include "defines.h"
-#include "globals.h"
-#include "o_types.h"
-#include "colors.h"
-
-#include "../include/prototype.h"
+#include "libgeda_priv.h"
#ifdef HAVE_LIBDMALLOC
#include <dmalloc.h>
diff --git a/libgeda/src/s_clib.c b/libgeda/src/s_clib.c
index e604a19..2158e68 100644
--- a/libgeda/src/s_clib.c
+++ b/libgeda/src/s_clib.c
@@ -123,21 +123,11 @@
#include <dmalloc.h>
#endif
-#include <gtk/gtk.h>
-#include <libguile.h>
-
#include <sys/wait.h>
#include <time.h>
-#include "defines.h"
-#include "struct.h"
-#include "globals.h"
-#include "o_types.h"
-#include "colors.h"
-#include "i_vars.h"
-#include "prototype.h"
-#include "geda_list.h"
+#include "libgeda_priv.h"
/* Constant definitions
* ===================
diff --git a/libgeda/src/s_color.c b/libgeda/src/s_color.c
index f6fe17a..c3028b8 100644
--- a/libgeda/src/s_color.c
+++ b/libgeda/src/s_color.c
@@ -25,14 +25,7 @@
#include <string.h>
#endif
-#include <gtk/gtk.h>
-#include <libguile.h>
-
-#include "defines.h"
-#include "struct.h"
-#include "globals.h"
-
-#include "../include/prototype.h"
+#include "libgeda_priv.h"
#ifdef HAVE_LIBDMALLOC
#include <dmalloc.h>
diff --git a/libgeda/src/s_conn.c b/libgeda/src/s_conn.c
index 9ebd32b..9cb3d73 100644
--- a/libgeda/src/s_conn.c
+++ b/libgeda/src/s_conn.c
@@ -28,17 +28,7 @@
#include <stdarg.h>
#endif
-#include <gtk/gtk.h>
-#include <libguile.h>
-
-#include "defines.h"
-#include "struct.h"
-#include "defines.h"
-#include "globals.h"
-#include "colors.h"
-#include "o_types.h"
-
-#include "../include/prototype.h"
+#include "libgeda_priv.h"
#ifdef HAVE_LIBDMALLOC
#include <dmalloc.h>
diff --git a/libgeda/src/s_cue.c b/libgeda/src/s_cue.c
index 45f1ee6..82fa4d9 100644
--- a/libgeda/src/s_cue.c
+++ b/libgeda/src/s_cue.c
@@ -28,17 +28,7 @@
#include <stdarg.h>
#endif
-#include <gtk/gtk.h>
-#include <libguile.h>
-
-#include "defines.h"
-#include "struct.h"
-#include "defines.h"
-#include "globals.h"
-#include "o_types.h"
-#include "colors.h"
-
-#include "../include/prototype.h"
+#include "libgeda_priv.h"
#ifdef HAVE_LIBDMALLOC
#include <dmalloc.h>
diff --git a/libgeda/src/s_hierarchy.c b/libgeda/src/s_hierarchy.c
index b7295e5..1b6a02d 100644
--- a/libgeda/src/s_hierarchy.c
+++ b/libgeda/src/s_hierarchy.c
@@ -24,18 +24,7 @@
#include <stdlib.h>
#endif
-#include <gtk/gtk.h>
-#include <libguile.h>
-
-#include "defines.h"
-#include "struct.h"
-#include "defines.h"
-#include "globals.h"
-#include "o_types.h"
-
-#include "geda_list.h"
-
-#include "../include/prototype.h"
+#include "libgeda_priv.h"
#ifdef HAVE_LIBDMALLOC
#include <dmalloc.h>
diff --git a/libgeda/src/s_log.c b/libgeda/src/s_log.c
index 401080b..d28f3eb 100644
--- a/libgeda/src/s_log.c
+++ b/libgeda/src/s_log.c
@@ -40,17 +40,7 @@
#include <string.h>
#endif
-#include <gtk/gtk.h>
-#include <libguile.h>
-
-#include "defines.h"
-#include "struct.h"
-#include "defines.h"
-#include "globals.h"
-#include "funcs.h"
-#include "o_types.h"
-
-#include "../include/prototype.h"
+#include "libgeda_priv.h"
#ifdef HAVE_LIBDMALLOC
#include <dmalloc.h>
diff --git a/libgeda/src/s_menu.c b/libgeda/src/s_menu.c
index 9b52767..3bc3974 100644
--- a/libgeda/src/s_menu.c
+++ b/libgeda/src/s_menu.c
@@ -31,14 +31,7 @@
#include <dirent.h>
#endif
-#include <gtk/gtk.h>
-#include <libguile.h>
-
-#include "defines.h"
-#include "struct.h"
-#include "globals.h"
-
-#include "../include/prototype.h"
+#include "libgeda_priv.h"
#ifdef HAVE_LIBDMALLOC
#include <dmalloc.h>
diff --git a/libgeda/src/s_page.c b/libgeda/src/s_page.c
index 89ce467..b6c7398 100644
--- a/libgeda/src/s_page.c
+++ b/libgeda/src/s_page.c
@@ -30,22 +30,11 @@
#include <string.h>
#endif
-#include <gtk/gtk.h>
-#include <glib.h>
-#include <libguile.h>
#include <sys/types.h>
#include <sys/stat.h>
#include <unistd.h>
-#include "defines.h"
-#include "struct.h"
-#include "globals.h"
-#include "o_types.h"
-#include "funcs.h"
-
-#include "geda_list.h"
-
-#include "../include/prototype.h"
+#include "libgeda_priv.h"
#ifdef HAVE_LIBDMALLOC
#include <dmalloc.h>
diff --git a/libgeda/src/s_papersizes.c b/libgeda/src/s_papersizes.c
index 2b04324..d2369f7 100644
--- a/libgeda/src/s_papersizes.c
+++ b/libgeda/src/s_papersizes.c
@@ -28,14 +28,7 @@
#include <string.h>
#endif
-#include <gtk/gtk.h>
-#include <libguile.h>
-
-#include "defines.h"
-#include "struct.h"
-#include "globals.h"
-
-#include "../include/prototype.h"
+#include "libgeda_priv.h"
#ifdef HAVE_LIBDMALLOC
#include <dmalloc.h>
diff --git a/libgeda/src/s_slib.c b/libgeda/src/s_slib.c
index 2892c93..ea96161 100644
--- a/libgeda/src/s_slib.c
+++ b/libgeda/src/s_slib.c
@@ -34,14 +34,7 @@
#include <dirent.h>
#endif
-#include <gtk/gtk.h>
-#include <libguile.h>
-
-#include "defines.h"
-#include "struct.h"
-#include "globals.h"
-
-#include "../include/prototype.h"
+#include "libgeda_priv.h"
#ifdef HAVE_LIBDMALLOC
#include <dmalloc.h>
diff --git a/libgeda/src/s_stretch.c b/libgeda/src/s_stretch.c
index ef0d25c..f2fa8a7 100644
--- a/libgeda/src/s_stretch.c
+++ b/libgeda/src/s_stretch.c
@@ -28,17 +28,7 @@
#include <stdarg.h>
#endif
-#include <gtk/gtk.h>
-#include <libguile.h>
-
-#include "defines.h"
-#include "struct.h"
-#include "defines.h"
-#include "globals.h"
-#include "o_types.h"
-#include "colors.h"
-
-#include "../include/prototype.h"
+#include "libgeda_priv.h"
#ifdef HAVE_LIBDMALLOC
#include <dmalloc.h>
diff --git a/libgeda/src/s_textbuffer.c b/libgeda/src/s_textbuffer.c
index dccb806..4b0fd5c 100644
--- a/libgeda/src/s_textbuffer.c
+++ b/libgeda/src/s_textbuffer.c
@@ -31,16 +31,7 @@
#include <dmalloc.h>
#endif
-#include <gtk/gtk.h>
-#include <libguile.h>
-
-#include "defines.h"
-#include "struct.h"
-#include "globals.h"
-#include "o_types.h"
-#include "colors.h"
-#include "i_vars.h"
-#include "prototype.h"
+#include "libgeda_priv.h"
struct _TextBuffer
{
diff --git a/libgeda/src/s_tile.c b/libgeda/src/s_tile.c
index 2ab714d..b22654e 100644
--- a/libgeda/src/s_tile.c
+++ b/libgeda/src/s_tile.c
@@ -29,17 +29,7 @@
#include <stdarg.h>
#endif
-#include <gtk/gtk.h>
-#include <libguile.h>
-
-#include "defines.h"
-#include "struct.h"
-#include "defines.h"
-#include "globals.h"
-#include "o_types.h"
-#include "colors.h"
-
-#include "../include/prototype.h"
+#include "libgeda_priv.h"
#ifdef HAVE_LIBDMALLOC
#include <dmalloc.h>
diff --git a/libgeda/src/s_toplevel.c b/libgeda/src/s_toplevel.c
index 75101c6..dac7bac 100644
--- a/libgeda/src/s_toplevel.c
+++ b/libgeda/src/s_toplevel.c
@@ -31,17 +31,7 @@
#include <stdlib.h>
#endif
-#include <gtk/gtk.h>
-#include <libguile.h>
-
-#include "defines.h"
-#include "struct.h"
-#include "globals.h"
-#include "funcs.h"
-
-#include "../include/prototype.h"
-
-#include "geda_list.h"
+#include "libgeda_priv.h"
#ifdef HAVE_LIBDMALLOC
#include <dmalloc.h>
diff --git a/libgeda/src/s_undo.c b/libgeda/src/s_undo.c
index 4238afd..791bcb8 100644
--- a/libgeda/src/s_undo.c
+++ b/libgeda/src/s_undo.c
@@ -28,17 +28,7 @@
#include <unistd.h>
#endif
-#include <gtk/gtk.h>
-#include <libguile.h>
-
-#include "defines.h"
-#include "struct.h"
-#include "defines.h"
-#include "globals.h"
-#include "colors.h"
-#include "o_types.h"
-
-#include "../include/prototype.h"
+#include "libgeda_priv.h"
#ifdef HAVE_LIBDMALLOC
#include <dmalloc.h>
diff --git a/libgeda/src/u_basic.c b/libgeda/src/u_basic.c
index 743a3fa..7b2ed4b 100644
--- a/libgeda/src/u_basic.c
+++ b/libgeda/src/u_basic.c
@@ -31,14 +31,7 @@
#include <stdlib.h>
#endif
-#include <gtk/gtk.h>
-#include <libguile.h>
-
-#include "defines.h"
-#include "struct.h"
-#include "globals.h"
-
-#include "../include/prototype.h"
+#include "libgeda_priv.h"
#ifdef HAVE_LIBDMALLOC
#include <dmalloc.h>
_______________________________________________
geda-cvs mailing list
geda-cvs@xxxxxxxxxxxxxx
http://www.seul.org/cgi-bin/mailman/listinfo/geda-cvs