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

8 files changed, 78 insertions, 0 deletions

diff --git a/data/Makefile.am b/data/Makefile.am
new file mode 100644
index 00000000..cc6cb98d
--- /dev/null
+++ b/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)
diff --git a/data/glade-3.desktop.in.in b/data/glade-3.desktop.in.in
new file mode 100644
index 00000000..fcfcb7ed
--- /dev/null
+++ b/data/glade-3.desktop.in.in
@@ -0,0 +1,17 @@
+[Desktop Entry]
+Encoding=UTF-8
+_Name=Glade Interface Designer
+_GenericName=User Interface Designer
+_Comment=Create or open user interface designs for GTK+ applications
+Exec=glade-3 %F
+Terminal=false
+StartupNotify=true
+Type=Application
+Icon=glade-3
+Categories=GTK;Application;Development;
+MimeType=application/x-glade;
+X-GNOME-DocPath=glade/glade.xml
+X-GNOME-Bugzilla-Bugzilla=GNOME
+X-GNOME-Bugzilla-Product=glade3
+X-GNOME-Bugzilla-Version=@VERSION@
+X-GNOME-Bugzilla-Component=general
diff --git a/data/icons/Makefile.am b/data/icons/Makefile.am
new file mode 100644
index 00000000..4060931f
--- /dev/null
+++ b/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)
diff --git a/data/icons/devhelp.png b/data/icons/devhelp.png
new file mode 100644
index 00000000..12cad127
--- /dev/null
+++ b/data/icons/devhelp.png
diff --git a/data/icons/glade-3.png b/data/icons/glade-3.png
new file mode 100644
index 00000000..644f3f72
--- /dev/null
+++ b/data/icons/glade-3.png
diff --git a/data/icons/plus.png b/data/icons/plus.png
new file mode 100644
index 00000000..313f4453
--- /dev/null
+++ b/data/icons/plus.png
diff --git a/data/icons/selector.png b/data/icons/selector.png
new file mode 100644
index 00000000..b945618c
--- /dev/null
+++ b/data/icons/selector.png
diff --git a/data/libgladeui-1.0.pc.in b/data/libgladeui-1.0.pc.in
new file mode 100644
index 00000000..fa759086
--- /dev/null
+++ b/data/libgladeui-1.0.pc.in
@@ -0,0 +1,18 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+datarootdir=@datarootdir@
+datadir=@datadir@
+includedir=@includedir@/libgladeui-1.0/libgladeui
+catalogdir=@datadir@/@PACKAGE@/catalogs
+pixmapdir=@datadir@/@PACKAGE@/pixmaps
+moduledir=@libdir@/@PACKAGE@/modules
+
+
+Name: Glade
+Description: Glade interface designer library
+URL: http://glade.gnome.org
+Version: @PACKAGE_VERSION@
+Requires: gtk+-2.0 >= 2.10.0 libxml-2.0 >= 2.4.0
+Libs: -L${libdir} -lgladeui-1
+Cflags: -I${includedir}