anjuta r4828 - in trunk: . plugins/tools/scripts scripts

[jhs svn gnome org]

Author: jhs
Date: Wed Mar  4 15:19:05 2009
New Revision: 4828
URL: http://svn.gnome.org/viewvc/anjuta?rev=4828&view=rev

Log:
2009-03-04  Johannes Schmid  <jhs gnome org>

	* configure.in:
	* plugins/tools/scripts/Makefile.am:
	* scripts/build-schemas.mk:
	Fixed schema file generation and distcheck completely

Modified:
   trunk/ChangeLog
   trunk/configure.in
   trunk/plugins/tools/scripts/Makefile.am
   trunk/scripts/build-schemas.mk

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Wed Mar  4 15:19:05 2009
@@ -477,39 +477,6 @@
 dnl ***************************************************************************
 GTK_DOC_CHECK([1.4])
 
-dnl ***************************************************************************
-dnl Check for Gnome XML [Is this still required?]
-dnl ***************************************************************************
-dnl GNOME_XML_CHECK
-
-dnl ***************************************************************************
-dnl Check for ScrollKeeper [No documentation for now]
-dnl ***************************************************************************
-dnl AC_PATH_PROG(SCROLLKEEPER_CONFIG, scrollkeeper-config,no)
-dnl if test x$SCROLLKEEPER_CONFIG = xno; then
-dnl   AC_MSG_ERROR(Couldn't find scrollkeeper-config, please install the scrollkeeper package. You can get it from http://scrollkeeper.sourceforge.net/)
-dnl fi
-dnl SCROLLKEEPER_REQUIRED=0.1.4
-dnl AC_SUBST(SCROLLKEEPER_REQUIRED)
-
-dnl ***************************************************************************
-dnl Checking for scrollkeeper version [No documentation for now]
-dnl ***************************************************************************
-dnl AC_MSG_CHECKING(for scrollkeeper version number)
-dnl if scrollkeeper-config --version > /dev/null 2>&1; then 
-dnl    version=`scrollkeeper-config --version`; \
-dnl    vers=`echo $version | awk 'BEGIN { FS = "."; } { print $1 * 1000 + $2;}'`; \
-dnl    AC_MSG_RESULT(found $version)
-dnl    SCROLLKEEPER_VERSION_NUM=$vers
-dnl else
-dnl    AC_MSG_ERROR(Did not find scrollkeeper installed)
-dnl fi
-dnl AC_SUBST(SCROLLKEEPER_VERSION_NUM)
-
-dnl ***************************************************************************
-dnl Tagmanager checks.
-dnl ***************************************************************************
-
 dnl Define convenience macros
 dnl -------------------------
 dnl CHECK_HEADER_DEFINE(LABEL, HEADER [,ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND ] ])

Modified: trunk/plugins/tools/scripts/Makefile.am
==============================================================================
--- trunk/plugins/tools/scripts/Makefile.am	(original)
+++ trunk/plugins/tools/scripts/Makefile.am	Wed Mar  4 15:19:05 2009
@@ -26,3 +26,4 @@
      
 tools-2.xml: tools-2.xml.in
 
+CLEANFILES = tools-2.xml
\ No newline at end of file

Modified: trunk/scripts/build-schemas.mk
==============================================================================
--- trunk/scripts/build-schemas.mk	(original)
+++ trunk/scripts/build-schemas.mk	Wed Mar  4 15:19:05 2009
@@ -1,19 +1,19 @@
 # Targets for handing glade-to-GConf schema conversion for prefs keys
 
 prefs_glade_schemasdir = @GCONF_SCHEMA_FILE_DIR@
-prefs_glade_schemas_DATA = $(prefs_glade_files:.glade=.schemas)
+prefs_glade_schemas = $(prefs_glade_files:.glade=.schemas)
 
 %.schemas: %.glade
 	$(top_srcdir)/scripts/glade2schema.pl $(srcdir)/$(?) > $(@)
 
 if GCONF_SCHEMAS_INSTALL
-install-data-local:
+install-data-local: $(prefs_glade_schemas)
 	        for p in $(prefs_glade_schemas) ; do \
 	            GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $$p ; \
 	        done
 		@killall -1 gconfd-2 || true
 
-uninstall-local:
+uninstall-local: $(prefs_glade_schemas)
 	        for p in $(prefs_glade_schemas) ; do \
 	            GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-uninstall-rule $$p ; \
 	        done
@@ -25,5 +25,4 @@
 uninstall-local:
 endif
 
-CLEANFILES = prefs_glade_schemas
-DISTCLEANFILES = prefs_glade_schemas
+CLEANFILES = $(prefs_glade_schemas)