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

1 files changed, 9 insertions, 203 deletions

diff --git a/src/Makefile.am b/src/Makefile.am
index b439dd00..f803dcf4 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,35 +1,11 @@
-SUBDIRS=
-
-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\""	\
-	-DGLADE_GNOMEHELPDIR="\"$(HELP_DIR)\""
+## Process this file with automake to produce Makefile.in
 
 bin_PROGRAMS = glade-3
-lib_LTLIBRARIES = libgladeui-1.la
-
-BUILT_SOURCES = \
-        glade-marshallers.c \
-        glade-marshallers.h
-
-CLEANFILES = $(BUILT_SOURCES)
-EXTRA_DIST = glade-marshallers.list
-
 
-# The main application code
-#
 glade_3_CPPFLAGS = \
-	$(common_defines)  \
-	-I$(top_srcdir)    \
-	-I$(top_builddir)  \
+	-I$(top_srcdir)/gladeui    \
+	-I$(top_builddir)/gladeui  \
+	-DGLADE_GNOMEHELPDIR="\"$(HELP_DIR)\""
 	$(AM_CPPFLAGS)
 
 glade_3_CFLAGS =           \
@@ -37,185 +13,15 @@ glade_3_CFLAGS =           \
 	$(GTK_CFLAGS)      \
 	$(AM_CFLAGS)
 
-glade_3_LDFLAGS = \
-	$(AM_LDFLAGS)
+glade_3_LDFLAGS = $(AM_LDFLAGS)
 
-glade_3_LDADD = libgladeui-1.la
+glade_3_LDADD = $(top_builddir)/gladeui/libgladeui-1.la
 
 glade_3_SOURCES = \
-	glade-project-window.c glade-project-window.h \
+	glade-project-window.c \
+	glade-project-window.h \
 	main.c
 
 if WITH_WIN32
-glade_3_LDFLAGS += -mwindows
+  glade_3_LDFLAGS += -mwindows
 endif
-
-# The GTK catalog backend
-gladegtk_LTLIBRARIES = libgladegtk.la
-gladegtkdir = $(pkglibdir)/modules
-
-libgladegtk_la_CPPLAGS =   \
-	$(common_defines)  \
-	-I$(top_srcdir)    \
-	-I$(top_builddir)  \
-	$(AM_CPPFLAGS)
-
-libgladegtk_la_CFLAGS =    \
-	-g -Wall           \
-	$(GTK_CFLAGS)	   \
-	$(AM_CFLAGS)
-
-libgladegtk_la_SOURCES     = glade-gtk.c
-libgladegtk_la_LDFLAGS     = -module -avoid-version $(AM_LDFLAGS)
-libgladegtk_la_LIBADD      = libgladeui-1.la $(GTK_LIBS)
-libgladegtkincludedir      = $(includedir)/libgladeui-1.0/libgladeui
-libgladegtkinclude_HEADERS = glade-gtk.h
-
-# 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
-
-pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = libgladeui-1.0.pc
-
-if BUILD_PYTHON
-gladepython_LTLIBRARIES = libgladepython.la
-gladepythondir = $(pkglibdir)/bindings
-libgladepython_la_SOURCES = glade-python.c glade-python-gwa.c
-libgladepython_la_CPPFLAGS = $(common_defines) $(AM_CPPFLAGS)
-libgladepython_la_CFLAGS = -g -Wall $(PYTHON_CFLAGS) $(GTK_CFLAGS) $(AM_CFLAGS)
-libgladepython_la_LDFLAGS = -module -avoid-version $(PYTHON_LIBS) $(AM_LDFLAGS)
-libgladepython_la_LIBADD = libgladeui-1.la $(PYTHON_LIBS)
-
-endif
-
-if BUILD_GNOME
-gladegnome_LTLIBRARIES = libgladegnome.la
-gladegnomedir = $(pkglibdir)/modules
-libgladegnome_la_SOURCES = glade-gnome.c
-libgladegnome_la_CPPFLAGS = $(common_defines) $(AM_CPPFLAGS)
-libgladegnome_la_CFLAGS = -g -Wall $(GNOME_CFLAGS) $(AM_CPPFLAGS)
-libgladegnome_la_LDFLAGS = -module -avoid-version $(GNOME_LIBS) $(AM_LDFLAGS)
-libgladegnome_la_LIBADD = libgladeui-1.la $(GLADE_LIBS)
-endif
-
-if WITH_WIN32
-  libgladegtk_la_LDFLAGS += -no-undefined
-  libgladeui_1_la_LDFLAGS += -no-undefined
-
-if BUILD_GNOME
-  libgladegnome_la_LDFLAGS += -no-undefined
-endif
-
-if BUILD_PYTHON
-  libgladepython_la_LDFLAGS += -no-undefined
-endif
-
-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 )