cleanup

[Jeroen Zwartepoorte <jeroen xs4all nl>]

Hi JP,

I just committed the attached patch. It fixes some auto* stuff and it
moves some files to a dedicated "data" directory (anjuta2.desktop.in,
anjuta2.schemas.in, man page, new anjuta2.applications, anjuta2.png
etc.)

Hopefully i'll get mime type working soon as well (.anjuta project
files, although those files still need to be implemented before you can
actually do anything with them :)

Regards,

Jeroen

? cleanup.patch
? plugins/project-manager/pm.patch
Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/anjuta2/ChangeLog,v
retrieving revision 1.246
diff -u -r1.246 ChangeLog
--- ChangeLog	20 Jan 2003 16:40:00 -0000	1.246
+++ ChangeLog	24 Jan 2003 12:45:22 -0000
@@ -1,3 +1,25 @@
+2003-01-24  Jeroen Zwartepoorte  <jeroen xs4all nl>
+
+	* Anjuta2.desktop.in:
+	* Makefile.am:
+	* acconfig.h: Removed (deprecated).
+	* anjuta-clean.sh:
+	* anjuta.1:
+	* anjuta2.png:
+	* anjuta2.schemas.in:
+	* configure.in: Removed AC_ARG_PROGRAM (duplicate). Don't hardcode the
+	gconftool-2 location, use AC_PATH_PROG instead.
+	* data/.cvsignore:
+	* data/Makefile.am:
+	* data/anjuta-clean.sh:
+	* data/anjuta2.1:
+	* data/anjuta2.applications:
+	* data/anjuta2.desktop.in:
+	* data/anjuta2.png:
+	* data/anjuta2.schemas.in:
+
+	Moved files to data directory. Added new anjuta2.applications file.
+
 2002-03-20  Pablo Saratxaga  <pablo mandrakesoft com>
 
 	* configure.in: Added Danish (da) and Ukrainina (uk) to ALL_LINGUAS
@@ -13,8 +35,8 @@
 
 2003-01-12  Jeroen Zwartepoorte  <jeroen xs4all nl>
 
-	* plugins/project-manager/project-tool.c: (init_project_view): Fix missing
-	gnome-i18n.h include and add shadow around GbfProjectView tree.
+	* plugins/project-manager/project-tool.c: (init_project_view): Fix
+	missing gnome-i18n.h include and add shadow around GbfProjectView tree.
 
 2003-01-12  Gustavo Giraldez  <gustavo giraldez gmx net>
 
@@ -25,17 +47,14 @@
 	Implemented remove_source.
 
 2002-01-10  Jeroen Zwartepoorte  <jeroen xs4all nl>
- 
+
 	* configure.in: Built terminal plugin only if vte is available.
-	
- 	* plugins/Makefile.am: Idem.
-	
- 	* plugins/terminal/Makefile.am: Use VTE_CFLAGS/LIBS.
-	
- 	* plugins/terminal/terminal-tool.c: (new_terminal), (term_init_cb),
- 	(term_exited_cb), (term_destroy_cb), (term_new), (shell_set): Uses vte
- 	now instead of zvt. Uses gnome-terminal gconf keys for font, colors and
- 	behavior. Implemented creation of more than 1 terminal.
+	* plugins/Makefile.am: Idem.
+	* plugins/terminal/Makefile.am: Use VTE_CFLAGS/LIBS.
+	* plugins/terminal/terminal-tool.c: (new_terminal), (term_init_cb),
+	(term_exited_cb), (term_destroy_cb), (term_new), (shell_set): Uses vte
+	now instead of zvt. Uses gnome-terminal gconf keys for font, colors and
+	behavior. Implemented creation of more than 1 terminal.
 
 2003-01-07  Gustavo Giraldez  <gustavo giraldez gmx net>
 
Index: Makefile.am
===================================================================
RCS file: /cvs/gnome/anjuta2/Makefile.am,v
retrieving revision 1.24
diff -u -r1.24 Makefile.am
--- Makefile.am	9 Jun 2002 00:30:19 -0000	1.24
+++ Makefile.am	24 Jan 2003 12:45:22 -0000
@@ -1,31 +1,12 @@
 ## Process this file with automake to produce Makefile.in
 
-SUBDIRS = po libanjuta src plugins
+SUBDIRS = po libanjuta src plugins data
 
-man_MANS = anjuta.1
-
-appicon_DATA = anjuta2.png
-appicondir = $(datadir)/pixmaps
-
-desktopdir = $(datadir)/applications
-desktop_in_files = Anjuta2.desktop.in
-desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
- INTLTOOL_DESKTOP_RULE@
-
-bin_SCRIPTS=anjuta-clean.sh
-
-schemasdir = $(sysconfdir)/gconf/schemas
-schemas_in_files = anjuta2.schemas.in
-schemas_DATA = $(schemas_in_files:.schemas.in=.schemas)
- INTLTOOL_SCHEMAS_RULE@
-
-install-data-local:
-	GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) gconftool-2 --shutdown
-	GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) gconftool-2 --makefile-install-rule $(schemas_DATA)
-
-EXTRA_DIST = BUGS ChangeLog README INSTALL TODO anjuta2.png \
-	anjuta2.keys.in \
+EXTRA_DIST = \
+	BUGS \
+	ChangeLog \
+	README \
+	INSTALL \
+	TODO \
 	docs/tool-tutorial.txt \
-	$(man_MANS) $(bin_SCRIPTS) anjuta.spec Anjuta2.desktop \
-	$(schemas_DATA)
-
+	anjuta.spec
Index: configure.in
===================================================================
RCS file: /cvs/gnome/anjuta2/configure.in,v
retrieving revision 1.86
diff -u -r1.86 configure.in
--- configure.in	20 Jan 2003 16:40:00 -0000	1.86
+++ configure.in	24 Jan 2003 12:45:23 -0000
@@ -103,7 +103,6 @@
 AC_PROG_CC
 AC_ISC_POSIX
 AC_HEADER_STDC
-AC_ARG_PROGRAM
 AM_PROG_LIBTOOL
 AM_GCONF_SOURCE_2
 
@@ -112,7 +111,7 @@
 
 GETTEXT_PACKAGE=anjuta2
 AC_SUBST(GETTEXT_PACKAGE)
-AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTTEXT_PACKAGE")
+AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTTEXT_PACKAGE", [Package name for gettext])
 
 ORBIT_IDL="`$PKG_CONFIG --variable=orbit_idl ORBit-2.0`"
 AC_SUBST(ORBIT_IDL)
@@ -131,6 +130,8 @@
 GLIB_MKENUMS="`$PKG_CONFIG --variable=glib_mkenums glib-2.0`"
 AC_SUBST(GLIB_MKENUMS)
 
+AC_PATH_PROG(GCONFTOOL, gconftool-2)
+
 dnl Set PREFIX
 if test "x${prefix}" = "xNONE"; then
   packageprefix=${ac_default_prefix}
@@ -159,5 +160,6 @@
 plugins/gnome-project-types/Makefile
 plugins/gnome-project-types/gnome-application-templates/Makefile
 po/Makefile.in
+data/Makefile
 anjuta.spec
 ])