Reorganised package structure, moved a lot of files and directories.

* Reorganised package structure, moved a lot of files
	  and directories. Modified the Makefile.am in most directories.

	* po/POTFILES.in, po/POTFILES.skip: Update for reorganisation.

	* configure.ac: Add files to AC_CONFIG_FILES. Change AC_CONFIG_SRCDIR.


svn path=/trunk/; revision=1050

ChangeLog

@@ -1,3 +1,12 @@
+2007-01-23  Vincent Geddes <vincent.geddes@gmail.com>
+
+	* Reorganised package structure, moved a lot of files
+	  and directories. Modified the Makefile.am in most directories.
+
+	* po/POTFILES.in, po/POTFILES.skip: Update for reorganisation.
+
+	* configure.ac: Add files to AC_CONFIG_FILES. Change AC_CONFIG_SRCDIR.
+
 2007-01-22  Jeff Westerinen  <jeff.westerinen@palmsource.com>
 	Fix for bug 345603:
 
@@ -8,7 +17,7 @@
 	    - glade_command_cut
 	    - glade_command_copy
 	    - glade_command_paste
-            These are now command aliases.
+	      These are now command aliases.
 	    - Added a new drag-and-drop command, glade_command_dnd, to replace former
 	      glade_command_cut/glade_command_paste command pairs.
 	    - Added the following set of canonical commands which comprise the implementation

Makefile.am

@@ -1,48 +1,23 @@
 ## Process this file with automake to produce Makefile.in
 
 if DISABLE_USER_MANUAL
-SUBDIRS = src po pixmaps widgets doc
+SUBDIRS = po data gladeui src plugins bindings doc
 else
-SUBDIRS = src po pixmaps widgets doc help
+SUBDIRS = po data gladeui src plugins bindings help doc
 endif
 
 ACLOCAL_AMFLAGS = -I m4
 
-@INTLTOOL_DESKTOP_RULE@
-
-desktop_in_files = glade-3.desktop.in.in
-
-desktopdir = $(datadir)/applications
-desktop_DATA = $(desktop_in_files:.desktop.in.in=.desktop)
-
-appicondir = $(datadir)/icons/hicolor/48x48/apps
-appicon_DATA = glade-3.png
-
-gtk_update_icon_cache = gtk-update-icon-cache -f -t $(datadir)/icons/hicolor
-
-install-data-hook: update-icon-cache
-uninstall-hook: update-icon-cache
-update-icon-cache:
-	@-if test -z "$(DESTDIR)"; then \
-		echo "Updating Gtk icon cache."; \
-                $(gtk_update_icon_cache); \
-	else \
-		echo "*** Icon cache not updated.  After (un)install, run this:"; \
-                echo "***   $(gtk_update_icon_cache)"; \
-	fi
-
 EXTRA_DIST = \
+	autogen.sh \
 	COPYING.GPL \
 	COPYING.LGPL \
 	m4 \
-	glade-3.png \
 	intltool-extract.in \
 	intltool-merge.in \
 	intltool-update.in \
 	gnome-doc-utils.make
 
-CLEANFILES = $(desktop_DATA)
-
 DISTCLEANFILES = intltool-extract \
                  intltool-merge \
                  intltool-update \

bindings/Makefile.am

@@ -0,0 +1,3 @@
+## Process this file with automake to produce Makefile.in
+
+SUBDIRS = python

bindings/python/Makefile.am

@@ -0,0 +1,29 @@
+## Process this file with automake to produce Makefile.in
+
+libgladeui = $(top_builddir)/gladeui/libgladeui-1.la
+
+
+# libgladepython
+
+gladepython_LTLIBRARIES = libgladepython.la
+gladepythondir = $(pkglibdir)/bindings
+
+libgladepython_la_SOURCES = glade-python.c glade-python-gwa.c
+libgladepython_la_CPPFLAGS = \
+	-I$(top_srcdir)      \
+	-I$(top_builddir)    \
+	$(AM_CPPFLAGS)
+libgladepython_la_CFLAGS = \
+	-g -Wall           \
+	$(top_srcdir)      \
+	-I$(top_srcdir)/gladeui    \
+	-I$(top_builddir)/gladeui  \
+	$(PYTHON_CFLAGS)   \
+	$(GTK_CFLAGS)      \
+	$(AM_CFLAGS)
+libgladepython_la_LDFLAGS = -module -avoid-version $(PYTHON_LIBS) $(AM_LDFLAGS)
+libgladepython_la_LIBADD = $(libgladeui) $(PYTHON_LIBS)
+
+if WITH_WIN32
+  libgladepython_la_LDFLAGS += -no-undefined
+endif

bindings/python/glade-python-gwa.c

@@ -7,7 +7,7 @@
 #line 23 "glade-python-gwa.override"
 #include <Python.h>               
 #include <pygobject.h>
-#include "glade.h"
+#include <glade.h>
 
 static gboolean
 glade_python_support_init_value (GObject *object,

bindings/python/glade-python-gwa.override

@@ -20,9 +20,9 @@
  */
 %%
 headers
+#include <glade.h>
 #include <Python.h>               
 #include <pygobject.h>
-#include "glade.h"
 
 static gboolean
 glade_python_support_init_value (GObject *object,

bindings/python/glade-python.c

@@ -20,14 +20,15 @@
  *   Juan Pablo Ugarte <juanpablougarte@gmail.com>
  */
 
-#ifdef HAVE_CONFIG_H
 #include <config.h>
-#endif
+
+
+#include <glade.h>
+#include <glade-binding.h>
 
 #include <Python.h>
 #include <pygobject.h>
-#include "glade.h"
-#include "glade-binding.h"
+
 
 static GtkTextBuffer *PythonBuffer = NULL;
 static GtkTextMark   *PythonBufferEnd;

configure.ac

@@ -5,7 +5,7 @@ AC_INIT([glade3], [3.1.4],
 	[http://bugzilla.gnome.org/enter_bug.cgi?product=glade3])
 	
 AC_CONFIG_HEADERS([config.h])
-AC_CONFIG_SRCDIR([src/glade.h])
+AC_CONFIG_SRCDIR([gladeui/glade.h])
 AC_CONFIG_MACRO_DIR([m4])
 
 AC_CANONICAL_SYSTEM
@@ -160,14 +160,24 @@ AC_SUBST([AM_LDFLAGS])
 
 AC_CONFIG_FILES([
 Makefile
-glade-3.desktop.in
-pixmaps/Makefile
-pixmaps/16x16/Makefile
-pixmaps/22x22/Makefile
-widgets/Makefile
-po/Makefile.in
+data/libgladeui-1.0.pc
+data/glade-3.desktop.in
+data/Makefile
+data/icons/Makefile
+gladeui/Makefile
 src/Makefile
-src/libgladeui-1.0.pc
+plugins/Makefile
+plugins/gtk+/Makefile
+plugins/gtk+/icons/Makefile
+plugins/gtk+/icons/16x16/Makefile
+plugins/gtk+/icons/22x22/Makefile
+plugins/gnome/Makefile
+plugins/gnome/icons/Makefile
+plugins/gnome/icons/16x16/Makefile
+plugins/gnome/icons/22x22/Makefile
+bindings/Makefile
+bindings/python/Makefile
+po/Makefile.in
 doc/Makefile
 doc/version.xml
 help/Makefile

data/Makefile.am

@@ -0,0 +1,19 @@
+## Process this file with automake to produce Makefile.in
+
+SUBDIRS = icons
+
+desktopdir = $(datadir)/applications
+desktop_in_files = glade-3.desktop.in.in
+desktop_DATA = $(desktop_in_files:.desktop.in.in=.desktop)
+@INTLTOOL_DESKTOP_RULE@
+
+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA = libgladeui-1.0.pc
+
+EXTRA_DIST = 				\
+	$(desktop_in_files)		\
+	libgladeui-1.0.pc.in
+
+CLEANFILES =	 			\
+	$(desktop_DATA)			\
+	$(pkgconfig_DATA)

data/icons/Makefile.am

@@ -0,0 +1,24 @@
+## Process this file with automake to produce Makefile.in
+
+appicondir = $(datadir)/icons/hicolor/48x48/apps
+appicon_DATA = glade-3.png
+
+gtk_update_icon_cache = gtk-update-icon-cache -f -t $(datadir)/icons/hicolor
+
+install-data-hook: update-icon-cache
+uninstall-hook: update-icon-cache
+update-icon-cache:
+	@-if test -z "$(DESTDIR)"; then \
+		echo "Updating Gtk icon cache."; \
+                $(gtk_update_icon_cache); \
+	else \
+		echo "*** Icon cache not updated.  After (un)install, run this:"; \
+                echo "***   $(gtk_update_icon_cache)"; \
+	fi
+	
+
+pixmapsdir = $(pkgdatadir)/pixmaps
+pixmaps_DATA = selector.png devhelp.png plus.png
+
+	
+EXTRA_DIST = glade-3.png $(pixmaps_DATA)

doc/Makefile.am

@@ -1,7 +1,7 @@
 ## Process this file with automake to produce Makefile.in
 
 # We require automake 1.6 at least.
-AUTOMAKE_OPTIONS = 1.6
+AUTOMAKE_OPTIONS = 1.9
 
 # This is a blank Makefile.am for using gtk-doc.
 # Copy this to your project's API docs directory and modify the variables to
@@ -17,7 +17,7 @@ DOC_MAIN_SGML_FILE=$(DOC_MODULE)-docs.sgml
 # The directory containing the source code. Relative to $(srcdir).
 # gtk-doc will search all .c & .h files beneath here for inline comments
 # documenting the functions and macros.
-DOC_SOURCE_DIR=../src
+DOC_SOURCE_DIR=../gladeui
 
 # Extra options to pass to gtkdoc-scangobj. Not normally needed.
 SCANGOBJ_OPTIONS=
@@ -42,8 +42,8 @@ FIXXREF_OPTIONS=
 # Used for dependencies. The docs will be rebuilt if any of these change.
 # e.g. HFILE_GLOB=$(top_srcdir)/gtk/*.h
 # e.g. CFILE_GLOB=$(top_srcdir)/gtk/*.c
-HFILE_GLOB=$(top_srcdir)/src/*.h
-CFILE_GLOB=$(top_srcdir)/src/*.c
+HFILE_GLOB=$(top_srcdir)/gladeui/*.h
+CFILE_GLOB=$(top_srcdir)/gladeui/*.c
 
 # Header files to ignore when scanning.
 # e.g. IGNORE_HFILES=gtkdebug.h gtkintl.h
@@ -53,7 +53,6 @@ IGNORE_HFILES=\
 	glade-accumulators.h \
 	glade-marshallers.h \
 	glade-paths.h \
-	glade-project-window.h \
 	glade-custom.h \
 	glade-cursor.h \
 	glade-id-allocator.h \
@@ -94,8 +93,14 @@ expand_content_files=\
 # signals and properties.
 # e.g. INCLUDES=-I$(top_srcdir) -I$(top_builddir) $(GTK_DEBUG_FLAGS)
 # e.g. GTKDOC_LIBS=$(top_builddir)/gtk/$(gtktargetlib)
-INCLUDES=-I$(top_srcdir)/src `pkg-config --cflags gtk+-2.0`
-GTKDOC_LIBS=${top_builddir}/src/libgladeui-1.la
+GTKDOC_CFLAGS= \
+	-I$(top_srcdir)/gladeui	  \
+	-I$(top_builddir)/gladeui \
+	-I$(top_srcdir)           \
+	-I$(top_builddir)         \
+	`pkg-config --cflags gtk+-2.0`
+	
+GTKDOC_LIBS=${top_builddir}/gladeui/libgladeui-1.la
 
 # This includes the standard gtk-doc make rules, copied by gtkdocize.
 include $(top_srcdir)/gtk-doc.make

gladeui/Makefile.am

@@ -0,0 +1,135 @@
+
+common_defines = \
+	-DGLADE_DATADIR="\"$(pkgdatadir)\""		\
+	-DGLADE_LIBDIR="\"$(pkglibdir)\""		\
+	-DGLADE_CATALOGSDIR="\"$(pkgdatadir)/catalogs\""\
+	-DGLADE_MODULESDIR="\"$(pkglibdir)/modules\""	\
+	-DGLADE_PLUGINSDIR="\"$(pkglibdir)/plugins\""	\
+	-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
+
+BUILT_SOURCES = glade-marshallers.c glade-marshallers.h
+
+CLEANFILES = $(BUILT_SOURCES)
+EXTRA_DIST = glade-marshallers.list
+
+# The glade-3 core library
+libgladeui_1_la_SOURCES = \
+	glade-widget-adaptor.c \
+	glade-debug.c \
+	glade-project.c \
+	glade-parameter.c \
+	glade-placeholder.c \
+	glade-custom.c \
+	glade-project-view.c \
+	glade-xml-utils.c \
+	glade-palette.c \
+	glade-palette-item.c \
+	glade-palette-box.c \
+	glade-palette-expander.c \
+	glade-design-layout.c \
+	glade-design-view.c \
+	glade-cursor.c \
+	glade-property.c \
+	glade-property-class.c \
+	glade-popup.c \
+	glade-widget.c \
+	glade-catalog.c \
+	glade-editor-property.c \
+	glade-editor.c \
+	glade-utils.c \
+	glade-signal.c \
+	glade-signal-editor.c \
+	glade-clipboard.c \
+	glade-clipboard-view.c \
+	glade-command.c \
+	glade-id-allocator.c \
+	glade-marshallers.c \
+	glade-accumulators.c \
+	glade-parser.c \
+	glade-builtins.c \
+	glade-app.c \
+	glade-keysyms.c \
+	glade-fixed.c \
+	glade-binding.c \
+	glade-base-editor.c
+
+libgladeui_1_la_CPPFLAGS =  \
+	-DINSIDE_LIBGLADEUI \
+	$(common_defines)   \
+	-I$(top_srcdir)     \
+	-I$(top_builddir)   \
+	$(AM_CPPFLAGS)
+
+libgladeui_1_la_CFLAGS =    \
+	-g -Wall            \
+	$(GTK_CFLAGS)       \
+	$(AM_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
+libgladeuiinclude_HEADERS = \
+	glade.h \
+	glade-debug.h \
+	glade-project.h \
+	glade-project-view.h \
+	glade-parameter.h \
+	glade-placeholder.h \
+	glade-custom.h \
+	glade-editor.h \
+	glade-editor-property.h \
+	glade-signal-editor.h \
+	glade-palette.h \
+	glade-palette-item.h \
+	glade-palette-box.h \
+	glade-palette-expander.h \
+	glade-design-layout.h \
+	glade-design-view.h \
+	glade-cursor.h \
+	glade-widget.h \
+	glade-widget-adaptor.h \
+	glade-property.h \
+	glade-property-class.h \
+	glade-popup.h \
+	glade-catalog.h \
+	glade-utils.h \
+	glade-signal.h \
+	glade-xml-utils.h \
+	glade-clipboard.h \
+	glade-clipboard-view.h \
+	glade-command.h \
+	glade-id-allocator.h \
+	glade-marshallers.h \
+	glade-accumulators.h \
+	glade-parser.h \
+	glade-app.h \
+	glade-builtins.h \
+	glade-fixed.h \
+	glade-binding.h \
+	glade-base-editor.h \
+	fixed_bg.xpm \
+	atk.xpm
+	
+
+if WITH_WIN32
+  libgladeui_1_la_LDFLAGS += -no-undefined
+endif
+
+#
+# Marshaller generation
+#
+glade-marshallers.h: glade-marshallers.list $(GLIB_GENMARSHAL)
+	$(GLIB_GENMARSHAL) --prefix=glade_marshal $(srcdir)/glade-marshallers.list --header > glade-marshallers-h.tmp \
+	&& mv glade-marshallers-h.tmp glade-marshallers.h \
+	|| ( rm -f glade-marshallers-h.tmp && exit 1)
+glade-marshallers.c: glade-marshallers.list $(GLIB_GENMARSHAL)
+	$(GLIB_GENMARSHAL) --prefix=glade_marshal $(srcdir)/glade-marshallers.list --body > glade-marshallers-c.tmp     \
+	&& mv glade-marshallers-c.tmp glade-marshallers.c \
+	|| ( rm -f glade-marshallers-c.tmp && exit 1 )

gladeui/glade-utils.c

@@ -33,7 +33,6 @@
 
 #include "glade.h"
 #include "glade-project.h"
-#include "glade-project-window.h"
 #include "glade-command.h"
 #include "glade-debug.h"
 #include "glade-placeholder.h"

pixmaps/Makefile.am

@@ -1,8 +0,0 @@
-
-SUBDIRS = 16x16 22x22
-
-pixmapsdir = $(pkgdatadir)/pixmaps
-pixmaps_DATA = selector.png devhelp.png plus.png
-
-
-EXTRA_DIST = $(pixmaps_DATA)

plugins/Makefile.am

@@ -0,0 +1,3 @@
+## Process this file with automake to produce Makefile.in
+
+SUBDIRS = gtk+ gnome