Commit a769fa15 authored by Tristan Van Berkom's avatar Tristan Van Berkom
Browse files

fixed conditionally building gnome & python.


	* Makefile.am, configure.ac, plugins/Makefile.am, bindings/Makefile.am:
	  fixed conditionally building gnome & python.

	* data/libgladeui-1.0.pc.in: Renamed to gladeui-1.0.pc.in.
	  Updated for change in location of header files.

	* gladeui/glade.h, gladeui/glade-xml-utils.c: Cleaned up 'glade.h'.     
	  - Moved GLADE_TAG_* defines to glade-xml-utils.h.
	  - Nuked GLADE_GENERIC_BORDER_WIDTH.

	* gladeui/*.h, plugins/gtk+/glade-gtk.[ch],
	  plugins/gnome/glade-gnome.ch, bindings/python/*.[ch]:
	  Changed header files location for libgladeui. 	


svn path=/trunk/; revision=1054
parent 3c5eb7fa
2007-01-25 Tristan Van Berkom <tvb@gnome.org>
* Makefile.am, configure.ac, plugins/Makefile.am, bindings/Makefile.am:
fixed conditionally building gnome & python.
2007-01-25 Vincent Geddes <vincent.geddes@gmail.com>
* set 'svn:ignore' properties for the directory tree.
......@@ -5,6 +10,17 @@
* src/glade-project-window.c: Change window title in line with HIG.
* data/libgladeui-1.0.pc.in: Renamed to gladeui-1.0.pc.in.
Updated for change in location of header files.
* gladeui/glade.h, gladeui/glade-xml-utils.c: Cleaned up 'glade.h'.
- Moved GLADE_TAG_* defines to glade-xml-utils.h.
- Nuked GLADE_GENERIC_BORDER_WIDTH.
* gladeui/*.h, plugins/gtk+/glade-gtk.[ch],
plugins/gnome/glade-gnome.ch, bindings/python/*.[ch]:
Changed header files location for libgladeui.
2007-01-23 Vincent Geddes <vincent.geddes@gmail.com>
* Reorganised package structure, moved a lot of files
......
## Process this file with automake to produce Makefile.in
if DISABLE_USER_MANUAL
SUBDIRS = po data gladeui src plugins bindings doc
else
SUBDIRS = po data gladeui src plugins bindings help doc
if BUILD_USER_MANUAL
SUBDIRS += help
endif
ACLOCAL_AMFLAGS = -I m4
......
## Process this file with automake to produce Makefile.in
SUBDIRS = python
SUBDIRS =
if BUILD_PYTHON
SUBDIRS += python
endif
......@@ -16,8 +16,8 @@ libgladepython_la_CPPFLAGS = \
libgladepython_la_CFLAGS = \
-g -Wall \
$(top_srcdir) \
-I$(top_srcdir)/gladeui \
-I$(top_builddir)/gladeui \
-I$(top_srcdir) \
-I$(top_builddir) \
$(PYTHON_CFLAGS) \
$(GTK_CFLAGS) \
$(AM_CFLAGS)
......
......@@ -7,7 +7,7 @@
#line 23 "glade-python-gwa.override"
#include <Python.h>
#include <pygobject.h>
#include <glade.h>
#include <gladeui/glade.h>
static gboolean
glade_python_support_init_value (GObject *object,
......
......@@ -20,7 +20,7 @@
*/
%%
headers
#include <glade.h>
#include <gladeui/glade.h>
#include <Python.h>
#include <pygobject.h>
......
......@@ -23,8 +23,8 @@
#include <config.h>
#include <glade.h>
#include <glade-binding.h>
#include <gladeui/glade.h>
#include <gladeui/glade-binding.h>
#include <Python.h>
#include <pygobject.h>
......@@ -451,8 +451,7 @@ glade_python_binding_console_new (void)
gulong handler_id;
vbox = gtk_vbox_new (FALSE, 4);
gtk_container_set_border_width (GTK_CONTAINER (vbox),
GLADE_GENERIC_BORDER_WIDTH);
gtk_container_set_border_width (GTK_CONTAINER (vbox), 6);
sw = gtk_scrolled_window_new (NULL, NULL);
gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (sw),
......
......@@ -93,7 +93,7 @@ ENABLE_SK_TRUE="#"
ENABLE_SK_FALSE=""
fi
AM_CONDITIONAL(DISABLE_USER_MANUAL, test x"$enable_user_manual" = "xno")
AM_CONDITIONAL(BUILD_USER_MANUAL, test x"$enable_user_manual" = "xyes")
dnl ================================================================
dnl Scrollkeeper
......@@ -160,7 +160,7 @@ AC_SUBST([AM_LDFLAGS])
AC_CONFIG_FILES([
Makefile
data/libgladeui-1.0.pc
data/gladeui-1.0.pc
data/glade-3.desktop.in
data/Makefile
data/icons/Makefile
......
......@@ -8,11 +8,11 @@ desktop_DATA = $(desktop_in_files:.desktop.in.in=.desktop)
@INTLTOOL_DESKTOP_RULE@
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = libgladeui-1.0.pc
pkgconfig_DATA = gladeui-1.0.pc
EXTRA_DIST = \
$(desktop_in_files) \
libgladeui-1.0.pc.in
gladeui-1.0.pc.in
CLEANFILES = \
$(desktop_DATA) \
......
......@@ -3,7 +3,7 @@ exec_prefix=@exec_prefix@
libdir=@libdir@
datarootdir=@datarootdir@
datadir=@datadir@
includedir=@includedir@/libgladeui-1.0/libgladeui
includedir=@includedir@/libgladeui-1.0
catalogdir=@datadir@/@PACKAGE@/catalogs
pixmapdir=@datadir@/@PACKAGE@/pixmaps
moduledir=@libdir@/@PACKAGE@/modules
......
......@@ -8,7 +8,6 @@ common_defines = \
-DGLADE_BINDINGSDIR="\"$(pkglibdir)/bindings\"" \
-DGLADE_PIXMAPSDIR="\"$(pkgdatadir)/pixmaps\"" \
-DGLADE_SCRIPTSDIR="\"$(pkgdatadir)/scripts\"" \
-DGLADE_ICONDIR="\"$(datadir)/pixmaps\"" \
-DGLADE_LOCALEDIR="\"$(datadir)/locale\""
lib_LTLIBRARIES = libgladeui-1.la
......@@ -74,7 +73,7 @@ libgladeui_1_la_CFLAGS = \
libgladeui_1_la_LDFLAGS = -version-info $(GLADE_CURRENT):$(GLADE_REVISION):$(GLADE_AGE) $(AM_LDFLAGS)
libgladeui_1_la_LIBADD = $(GTK_LIBS)
libgladeuiincludedir=$(includedir)/libgladeui-1.0/libgladeui
libgladeuiincludedir=$(includedir)/libgladeui-1.0/gladeui
libgladeuiinclude_HEADERS = \
glade.h \
glade-debug.h \
......
......@@ -80,14 +80,13 @@ enum
static guint glade_app_signals[LAST_SIGNAL] = { 0 };
gchar *glade_pixmaps_dir = GLADE_PIXMAPSDIR;
gchar *glade_scripts_dir = GLADE_SCRIPTSDIR;
gchar *glade_catalogs_dir = GLADE_CATALOGSDIR;
gchar *glade_modules_dir = GLADE_MODULESDIR;
gchar *glade_bindings_dir = GLADE_BINDINGSDIR;
gchar *glade_plugins_dir = GLADE_PLUGINSDIR;
gchar *glade_pixmaps_dir = GLADE_PIXMAPSDIR;
gchar *glade_locale_dir = GLADE_LOCALEDIR;
gchar *glade_icon_dir = GLADE_ICONDIR;
gboolean glade_verbose = FALSE;
static GObjectClass * parent_class = NULL;
......@@ -152,13 +151,13 @@ glade_app_finalize (GObject *app)
{
#ifdef G_OS_WIN32
g_free (glade_pixmaps_dir);
g_free (glade_scripts_dir);
g_free (glade_catalogs_dir);
g_free (glade_modules_dir);
g_free (glade_bindings_dir);
g_free (glade_bindings_dir);
g_free (glade_pixmaps_dir);
g_free (glade_locale_dir);
g_free (glade_icon_dir);
#endif
glade_binding_unload_all ();
......@@ -314,13 +313,12 @@ glade_app_init (GladeApp *app)
gchar *prefix;
prefix = g_win32_get_package_installation_directory (NULL, NULL);
glade_pixmaps_dir = g_build_filename (prefix, "share", PACKAGE, "pixmaps", NULL);
glade_scripts_dir = g_build_filename (prefix, "share", PACKAGE, GLADE_BINDING_SCRIPT_DIR, NULL);
glade_pixmaps_dir = g_build_filename (prefix, "share", PACKAGE, "pixmaps", NULL);
glade_catalogs_dir = g_build_filename (prefix, "share", PACKAGE, "catalogs", NULL);
glade_modules_dir = g_build_filename (prefix, "lib", PACKAGE, "modules", NULL);
glade_bindings_dir = g_build_filename (prefix, "lib", PACKAGE, "bindings", NULL);
glade_locale_dir = g_build_filename (prefix, "share", "locale", NULL);
glade_icon_dir = g_build_filename (prefix, "share", "pixmaps", NULL);
g_free (prefix);
#endif
......
......@@ -22,10 +22,10 @@
#ifndef __GLADE_APP_H__
#define __GLADE_APP_H__
#include "glade-editor.h"
#include "glade-palette.h"
#include "glade-clipboard.h"
#include "glade-project-view.h"
#include <gladeui/glade-editor.h>
#include <gladeui/glade-palette.h>
#include <gladeui/glade-clipboard.h>
#include <gladeui/glade-project-view.h>
G_BEGIN_DECLS
......
......@@ -1857,7 +1857,7 @@ glade_base_editor_pack_new_window (GladeBaseEditor *editor,
gtk_button_box_set_child_secondary (GTK_BUTTON_BOX (buttonbox), button, TRUE);
}
gtk_container_set_border_width (GTK_CONTAINER (editor), GLADE_GENERIC_BORDER_WIDTH);
gtk_container_set_border_width (GTK_CONTAINER (editor), 6);
gtk_container_add (GTK_CONTAINER (window), GTK_WIDGET (editor));
gtk_window_set_default_size (GTK_WINDOW (window), 640, 480);
......
......@@ -26,8 +26,8 @@
#include <config.h>
#endif
#include "glade-widget.h"
#include "glade-marshallers.h"
#include <gladeui/glade-widget.h>
#include <gladeui/glade-marshallers.h>
#include <gtk/gtk.h>
G_BEGIN_DECLS
......
......@@ -3,7 +3,7 @@
#define __GLADE_BUILTINS_H__
#include <glib-object.h>
#include "glade.h"
#include <gladeui/glade.h>
G_BEGIN_DECLS
......
......@@ -251,7 +251,7 @@ glade_clipboard_view_construct (GladeClipboardView *view)
gtk_scrolled_window_set_shadow_type
(GTK_SCROLLED_WINDOW (scrolled_window), GTK_SHADOW_IN);
gtk_container_set_border_width (GTK_CONTAINER (scrolled_window),
GLADE_GENERIC_BORDER_WIDTH);
6);
gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled_window),
GTK_POLICY_AUTOMATIC,
GTK_POLICY_AUTOMATIC);
......
......@@ -2,7 +2,7 @@
#ifndef __GLADE_CLIPBOARD_VIEW_H__
#define __GLADE_CLIPBOARD_VIEW_H__
#include "glade.h"
#include <gladeui/glade.h>
G_BEGIN_DECLS
......
......@@ -2,7 +2,7 @@
#ifndef __GLADE_CLIPBOARD_H__
#define __GLADE_CLIPBOARD_H__
#include "glade.h"
#include <gladeui/glade.h>
G_BEGIN_DECLS
......
......@@ -2,12 +2,12 @@
#ifndef __GLADE_COMMAND_H__
#define __GLADE_COMMAND_H__
#include <gladeui/glade-placeholder.h>
#include <gladeui/glade-widget.h>
#include <gladeui/glade-signal.h>
#include <gladeui/glade-property.h>
#include <gladeui/glade-project.h>
#include <glib-object.h>
#include "glade-placeholder.h"
#include "glade-widget.h"
#include "glade-signal.h"
#include "glade-property.h"
#include "glade-project.h"
G_BEGIN_DECLS
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment