Commit 465cbccf authored by Naba Kumar's avatar Naba Kumar

Fixed paths configure variables to take automake configure variables

	* Makefile.am, configure.in, data/Makefile.am, doc/Makefile.am,
	global-tags/Makefile.am, launcher/Makefile.am, libegg/Makefile.am,
	pixmaps/Makefile.am, scripts/Makefile.am, src/Makefile.am,
	tagmanager/Makefile.am: Fixed paths configure variables to take
	automake configure variables instead of hardcoding.

	* global-tags/tm_global_tags.c: Formated code.

	* manuals/reference/libanjuta/tmpl/e-splash.sgml,
	manuals/reference/libanjuta/tmpl/ianjuta-context-list.sgml,
	manuals/reference/libanjuta/tmpl/ianjuta-context-text.sgml,
	manuals/reference/libanjuta/tmpl/ianjuta-context-tree.sgml,
	manuals/reference/libanjuta/tmpl/ianjuta-context.sgml,
	manuals/reference/libanjuta/tmpl/ianjuta-renderable.sgml,
	manuals/reference/libanjuta/tmpl/ianjuta-sand-box.sgml,
	manuals/reference/libanjuta/tmpl/ianjuta-transformable.sgml,
	manuals/reference/libanjuta/tmpl/libanjuta-unused.sgml: Updated.
parent 7166dadb
2005-05-21 Naba Kumar <naba@gnome.org>
* Makefile.am, configure.in, data/Makefile.am, doc/Makefile.am,
global-tags/Makefile.am, launcher/Makefile.am, libegg/Makefile.am,
pixmaps/Makefile.am, scripts/Makefile.am, src/Makefile.am,
tagmanager/Makefile.am: Fixed paths configure variables to take
automake configure variables instead of hardcoding.
* global-tags/tm_global_tags.c: Formated code.
* manuals/reference/libanjuta/tmpl/e-splash.sgml,
manuals/reference/libanjuta/tmpl/ianjuta-context-list.sgml,
manuals/reference/libanjuta/tmpl/ianjuta-context-text.sgml,
manuals/reference/libanjuta/tmpl/ianjuta-context-tree.sgml,
manuals/reference/libanjuta/tmpl/ianjuta-context.sgml,
manuals/reference/libanjuta/tmpl/ianjuta-renderable.sgml,
manuals/reference/libanjuta/tmpl/ianjuta-sand-box.sgml,
manuals/reference/libanjuta/tmpl/ianjuta-transformable.sgml,
manuals/reference/libanjuta/tmpl/libanjuta-unused.sgml: Updated.
2005-05-20 Naba Kumar <naba@gnome.org>
* README, anjuta.spec.in, configure.in: Updated Anjuta Descriptions
......
......@@ -5,9 +5,8 @@
SUBDIRS = po tagmanager global-tags scintilla \
libegg pixmaps scripts data launcher \
doc libanjuta plugins src manuals mime
# intl
anjutadocdir = ${prefix}/@NO_PREFIX_PACKAGE_DOC_DIR@
anjutadocdir = $(datadir)/doc
anjutadoc_DATA = \
README\
COPYING\
......@@ -18,7 +17,7 @@ anjutadoc_DATA = \
TODO\
FUTURE
anjuta_glade_filedir = $(prefix)/@NO_PREFIX_PACKAGE_DATA_DIR@/glade
anjuta_glade_filedir = $(anjuta_glade_dir)
anjuta_glade_file_DATA = anjuta.glade
EXTRA_DIST = \
......
......@@ -332,6 +332,7 @@ GETTEXT_PACKAGE=anjuta
AC_SUBST(GETTEXT_PACKAGE)
AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE", [GETTEXT package name])
AM_GLIB_GNU_GETTEXT
AM_GLIB_DEFINE_LOCALEDIR(PACKAGE_LOCALE_DIR)
dnl gtk-doc
dnl GTK_DOC_CHECK([1.0])
......@@ -823,84 +824,34 @@ AC_SUBST(SVN_INCLUDE)
AC_SUBST(SVN_LIB)
AC_SUBST(SVN_CFLAGS)
dnl ***************************************************************************
dnl Checks for Additional stuffs
dnl ***************************************************************************
dnl *********************************************************************
dnl Set PACKAGE DIRs in config.h
dnl *********************************************************************
dnl Set PACKAGE_LOCALE_DIR in config.h.
if test "x${prefix}" = "xNONE"; then
AC_DEFINE_UNQUOTED(PACKAGE_LOCALE_DIR, "${ac_default_prefix}/${DATADIRNAME}/locale", [Package local directory])
else
AC_DEFINE_UNQUOTED(PACKAGE_LOCALE_DIR, "${prefix}/${DATADIRNAME}/locale", [Package local directory])
fi
anjuta_save_prefix="$prefix"
anjuta_save_exec_prefix="$exec_prefix"
test "x$prefix" = xNONE && prefix=$ac_default_prefix
test "x$exec_prefix" = xNONE && exec_prefix=$prefix
dnl Set PACKAGE SOURCE DIR in config.h.
packagesrcdir=`cd $srcdir && pwd`
dnl Set PACKAGE PREFIX
if test "x${prefix}" = "xNONE"; then
packageprefix=${ac_default_prefix}
else
packageprefix=${prefix}
fi
dnl Set PACKAGE DATA & DOC DIR
systemdatadir=share
packagedatadir=share/${PACKAGE}
packagedocdir=share/doc/${PACKAGE}
packageplugindir=lib/${PACKAGE}/plugins/${VERSION}
dnl Set PACKAGE DIRs in config.h.
packagepixmapsdir=share/pixmaps/${PACKAGE}
packagehelpdir=share/gnome/help/${PACKAGE}
packagemenudir=share/gnome/apps
packageplugindir=lib/${PACKAGE}
dnl Subst PACKAGE_DATA_DIR.
NO_PREFIX_PACKAGE_DATA_DIR="${packagedatadir}"
AC_SUBST(NO_PREFIX_PACKAGE_DATA_DIR)
PACKAGE_DATA_DIR="${packageprefix}/${packagedatadir}"
AC_SUBST(PACKAGE_DATA_DIR)
SYSTEM_DATA_DIR="${packageprefix}/${systemdatadir}"
AC_SUBST(SYSTEM_DATA_DIR)
dnl Subst PACKAGE_DOC_DIR.
NO_PREFIX_PACKAGE_DOC_DIR="${packagedocdir}"
AC_SUBST(NO_PREFIX_PACKAGE_DOC_DIR)
PACKAGE_DOC_DIR="${packageprefix}/${packagedocdir}"
AC_SUBST(PACKAGE_DOC_DIR)
dnl Subst PACKAGE_PIXMAPS_DIR.
NO_PREFIX_PACKAGE_PIXMAPS_DIR="${packagepixmapsdir}"
AC_SUBST(NO_PREFIX_PACKAGE_PIXMAPS_DIR)
PACKAGE_PIXMAPS_DIR="${packageprefix}/${packagepixmapsdir}"
AC_SUBST(PACKAGE_PIXMAPS_DIR)
dnl Subst PACKAGE_HELP_DIR.
NO_PREFIX_PACKAGE_HELP_DIR="${packagehelpdir}"
AC_SUBST(NO_PREFIX_PACKAGE_HELP_DIR)
PACKAGE_HELP_DIR="${packageprefix}/${packagehelpdir}"
AC_SUBST(PACKAGE_HELP_DIR)
dnl Subst PACKAGE_MENU_DIR.
NO_PREFIX_PACKAGE_MENU_DIR="${packagemenudir}"
AC_SUBST(NO_PREFIX_PACKAGE_MENU_DIR)
PACKAGE_MENU_DIR="${packageprefix}/${packagemenudir}"
AC_SUBST(PACKAGE_MENU_DIR)
dnl Subst PACKAGE_PLUGIN_DIR.
NO_PREFIX_PACKAGE_PLUGIN_DIR="${packageplugindir}"
AC_SUBST(NO_PREFIX_PACKAGE_PLUGIN_DIR)
PACKAGE_PLUGIN_DIR="${packageprefix}/${packageplugindir}"
AC_SUBST(PACKAGE_PLUGIN_DIR)
AC_DEFINE_UNQUOTED(SYSTEM_DATA_DIR, "${packageprefix}/${systemdatadir}", [System data directory])
AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, "${packageprefix}/${packagedatadir}", [Package data directory])
AC_DEFINE_UNQUOTED(PACKAGE_DOC_DIR, "${packageprefix}/${packagedocdir}", [Package doc directory])
AC_DEFINE_UNQUOTED(PACKAGE_PIXMAPS_DIR, "${packageprefix}/${packagepixmapsdir}", [Package pixmaps directory])
AC_DEFINE_UNQUOTED(PACKAGE_HELP_DIR, "${packageprefix}/${packagehelpdir}", [Package help directory])
AC_DEFINE_UNQUOTED(PACKAGE_MENU_DIR, "${packageprefix}/${packagemenudir}", [Package program menu directory])
AC_DEFINE_UNQUOTED(PACKAGE_PLUGIN_DIR, "${packageprefix}/${packageplugindir}", [Package plugins directory])
systemdatadir=`eval echo ${datadir}`
packagedatadir=`eval echo ${datadir}/${PACKAGE}`
packagedocdir=`eval echo ${datadir}/doc`
packageplugindir=`eval echo ${libdir}/${PACKAGE}`
packagepixmapsdir=`eval echo ${datadir}/pixmaps/${PACKAGE}`
packagehelpdir=`eval echo ${datadir}/gnome/help/${PACKAGE}`
packagemenudir=`eval echo ${datadir}/gnome/apps`
prefix="$anjuta_save_prefix"
exec_prefix="$anjuta_save_exec_prefix"
AC_DEFINE_UNQUOTED(SYSTEM_DATA_DIR, "${systemdatadir}", [System data directory])
AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, "${packagedatadir}", [Package data directory])
AC_DEFINE_UNQUOTED(PACKAGE_DOC_DIR, "${packagedocdir}", [Package doc directory])
AC_DEFINE_UNQUOTED(PACKAGE_PIXMAPS_DIR, "${packagepixmapsdir}", [Package pixmaps directory])
AC_DEFINE_UNQUOTED(PACKAGE_HELP_DIR, "${packagehelpdir}", [Package help directory])
AC_DEFINE_UNQUOTED(PACKAGE_MENU_DIR, "${packagemenudir}", [Package program menu directory])
AC_DEFINE_UNQUOTED(PACKAGE_PLUGIN_DIR, "${packageplugindir}", [Package plugins directory])
AC_DEFINE_UNQUOTED(PACKAGE_SOURCE_DIR, "${packagesrcdir}", [Package source code directory])
dnl --------- help outputs -----------
......
......@@ -6,7 +6,7 @@
SUBDIRS = properties
anjuta_datadir = $(prefix)/@NO_PREFIX_PACKAGE_DATA_DIR@
anjuta_datadir = $(anjuta_data_dir)
anjuta_data_DATA = \
gdb.init\
......@@ -14,15 +14,13 @@ anjuta_data_DATA = \
EXTRA_DIST = $(anjuta_data_DATA)
## $(anjuta_mime_DATA) $(anjuta_mimelnk_DATA)
install-data-local: system.tags
$(INSTALL_DATA) system.tags $(DESTDIR)$(anjuta_datadir)
$(INSTALL_DATA) system.tags $(DESTDIR)$(anjuta_data_dir)
uninstall-local:
@rm -fv $(anjuta_datadir)/system.tags
-if test -d $(prefix)/@NO_PREFIX_PACKAGE_DATA_DIR@/properties; then \
rmdir $(prefix)/@NO_PREFIX_PACKAGE_DATA_DIR@/properties; fi
-if test -d $(DESTDIR)$(anjuta_data_dir)/properties; then \
rmdir $(DESTDIR)$(anjuta_data_dir)/properties; fi
clean-local:
@rm -f system.tags
......
......@@ -4,7 +4,7 @@
## If you don't want it to overwrite it,
## Please disable it in the Anjuta project configuration
anjuta_docdir = $(prefix)/@NO_PREFIX_PACKAGE_DOC_DIR@
anjuta_docdir = $(datadir)/doc
anjuta_doc_DATA = \
ScintillaDoc.html
......
......@@ -23,14 +23,14 @@ system.tags: create_global_tags.sh anjuta-tags
all: system.tags
install-data-local: system.tags
mkdir -p "$(DESTDIR)$(datadir)/anjuta/tags";
mkdir -p "$(DESTDIR)$(anjuta_data_dir)/tags";
for tagsfile in tags/*; do \
$(INSTALL_DATA) $$tagsfile $(DESTDIR)$(datadir)/anjuta/tags/; \
$(INSTALL_DATA) $$tagsfile $(DESTDIR)$(anjuta_data_dir)/tags/; \
done
## FIXME: We should only uninstall tags created by us.
uninstall-local:
rm -fr $(DESTDIR)$(datadir)/anjuta/tags
rm -fr $(DESTDIR)$(anjuta_data_dir)/tags
clean-local:
rm -fr system.tags tags
......@@ -9,9 +9,12 @@ int main(int argc, char **argv)
/* Create global taglist */
int status;
char *command;
command = g_strdup_printf("%s %s", pre_process, NVL(getenv("CFLAGS"), ""));
command = g_strdup_printf("%s %s", pre_process,
NVL(getenv("CFLAGS"), ""));
//printf(">%s<\n", command);
status = tm_workspace_create_global_tags(command, (const char **) (argv + 2), argc - 2, argv[1]);
status = tm_workspace_create_global_tags(command,
(const char **) (argv + 2),
argc - 2, argv[1]);
g_free(command);
if (!status)
return 1;
......
INCLUDES = $(GLIB_CFLAGS) -I. -I.. -g -O
# -DG_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED \
# -DGDK_PIXBUF_DEPRECATED \
# -DGTK_DISABLE_DEPRECATED -DGNOME_DISABLE_DEPRECATED
INCLUDES = $(GLIB_CFLAGS) -I. -I.. -g -O $(DEPRECATED_FLAGS)
bin_PROGRAMS = anjuta_launcher
anjuta_launcher_LDADD = $(GLIB_LIBS)
SUBDIRS = util treeviewutils menu recent-files
gladefiledir = $(prefix)/@NO_PREFIX_PACKAGE_DATA_DIR@/glade
gladefiledir = $(anjuta_glade_dir)
gladefile_DATA = layout.glade
INCLUDES = \
......
......@@ -29,6 +29,7 @@ ESplash
@splash:
@splash_image_pixbuf:
@progressbar_position:
<!-- # Unused Parameters # -->
@splash_image:
......@@ -39,6 +40,7 @@ ESplash
</para>
@image_file:
@progressbar_position:
@Returns:
......
......@@ -14,75 +14,3 @@ ianjuta-context-list
</para>
<!-- ##### ENUM IAnjutaContextListSize ##### -->
<para>
</para>
@IANJUTA_CONTEXT_LIST_MINI:
@IANJUTA_CONTEXT_LIST_SMALL:
@IANJUTA_CONTEXT_LIST_LARGE:
<!-- ##### MACRO IANJUTA_CONTEXT_LIST_ERROR ##### -->
<para>
</para>
<!-- ##### STRUCT IAnjutaContextList ##### -->
<para>
</para>
<!-- ##### STRUCT IAnjutaContextListIface ##### -->
<para>
</para>
@g_iface:
@get_size:
@render:
@set_size:
<!-- ##### FUNCTION ianjuta_context_list_error_quark ##### -->
<para>
</para>
@Returns:
<!-- ##### FUNCTION ianjuta_context_list_get_size ##### -->
<para>
</para>
@obj:
@err:
@Returns:
<!-- ##### FUNCTION ianjuta_context_list_render ##### -->
<para>
</para>
@obj:
@image:
@text:
@data:
@err:
<!-- ##### FUNCTION ianjuta_context_list_set_size ##### -->
<para>
</para>
@obj:
@size:
@err:
......@@ -14,64 +14,3 @@ ianjuta-context-text
</para>
<!-- ##### MACRO IANJUTA_CONTEXT_TEXT_ERROR ##### -->
<para>
</para>
<!-- ##### STRUCT IAnjutaContextText ##### -->
<para>
</para>
<!-- ##### STRUCT IAnjutaContextTextIface ##### -->
<para>
</para>
@g_iface:
@get_indentation:
@render:
@set_indentation:
<!-- ##### FUNCTION ianjuta_context_text_error_quark ##### -->
<para>
</para>
@Returns:
<!-- ##### FUNCTION ianjuta_context_text_get_indentation ##### -->
<para>
</para>
@obj:
@err:
@Returns:
<!-- ##### FUNCTION ianjuta_context_text_render ##### -->
<para>
</para>
@obj:
@text:
@err:
<!-- ##### FUNCTION ianjuta_context_text_set_indentation ##### -->
<para>
</para>
@obj:
@spaces:
@err:
......@@ -14,51 +14,3 @@ ianjuta-context-tree
</para>
<!-- ##### MACRO IANJUTA_CONTEXT_TREE_ERROR ##### -->
<para>
</para>
<!-- ##### STRUCT IAnjutaContextTree ##### -->
<para>
</para>
<!-- ##### STRUCT IAnjutaContextTreeIface ##### -->
<para>
</para>
@g_iface:
@down:
@up:
<!-- ##### FUNCTION ianjuta_context_tree_error_quark ##### -->
<para>
</para>
@Returns:
<!-- ##### FUNCTION ianjuta_context_tree_down ##### -->
<para>
</para>
@obj:
@err:
<!-- ##### FUNCTION ianjuta_context_tree_up ##### -->
<para>
</para>
@obj:
@err:
......@@ -14,61 +14,3 @@ ianjuta-context
</para>
<!-- ##### MACRO IANJUTA_CONTEXT_ERROR ##### -->
<para>
</para>
<!-- ##### STRUCT IAnjutaContext ##### -->
<para>
</para>
<!-- ##### STRUCT IAnjutaContextIface ##### -->
<para>
</para>
@g_iface:
@begin:
@clear:
@end:
<!-- ##### FUNCTION ianjuta_context_error_quark ##### -->
<para>
</para>
@Returns:
<!-- ##### FUNCTION ianjuta_context_begin ##### -->
<para>
</para>
@obj:
@err:
<!-- ##### FUNCTION ianjuta_context_clear ##### -->
<para>
</para>
@obj:
@err:
<!-- ##### FUNCTION ianjuta_context_end ##### -->
<para>
</para>
@obj:
@err:
......@@ -14,49 +14,3 @@ ianjuta-renderable
</para>
<!-- ##### ENUM IAnjutaRenderableError ##### -->
<para>
</para>
@IANJUTA_RENDERABLE_NOT_SUPPORTED:
<!-- ##### MACRO IANJUTA_RENDERABLE_ERROR ##### -->
<para>
</para>
<!-- ##### STRUCT IAnjutaRenderable ##### -->
<para>
</para>
<!-- ##### STRUCT IAnjutaRenderableIface ##### -->
<para>
</para>
@g_iface:
@render:
<!-- ##### FUNCTION ianjuta_renderable_error_quark ##### -->
<para>
</para>
@Returns:
<!-- ##### FUNCTION ianjuta_renderable_render ##### -->
<para>
</para>
@obj:
@context:
@err:
......@@ -14,60 +14,3 @@ ianjuta-sand-box
</para>
<!-- ##### ENUM IAnjutaSandBoxError ##### -->
<para>
</para>
@IANJUTA_SAND_BOX_ACCESS_VIOLATION:
<!-- ##### MACRO IANJUTA_SAND_BOX_ERROR ##### -->
<para>
</para>
<!-- ##### STRUCT IAnjutaSandBox ##### -->
<para>
</para>
<!-- ##### STRUCT IAnjutaSandBoxIface ##### -->
<para>
</para>
@g_iface:
@pop_lock:
@push_lock:
<!-- ##### FUNCTION ianjuta_sand_box_error_quark ##### -->
<para>
</para>
@Returns:
<!-- ##### FUNCTION ianjuta_sand_box_pop_lock ##### -->
<para>
</para>
@obj:
@lock_signature:
@err:
<!-- ##### FUNCTION ianjuta_sand_box_push_lock ##### -->
<para>
</para>
@obj:
@lock_signature:
@err:
......@@ -14,41 +14,3 @@ ianjuta-transformable
</para>
<!-- ##### MACRO IANJUTA_TRANSFORMABLE_ERROR ##### -->
<para>
</para>
<!-- ##### STRUCT IAnjutaTransformable ##### -->
<para>
</para>
<!-- ##### STRUCT IAnjutaTransformableIface ##### -->
<para>
</para>
@g_iface:
@transform:
<!-- ##### FUNCTION ianjuta_transformable_error_quark ##### -->
<para>
</para>
@Returns:
<!-- ##### FUNCTION ianjuta_transformable_transform ##### -->
<para>
</para>
@obj:
@err:
......@@ -1068,6 +1068,120 @@ Properties
@extentions:
@pattern:
<!-- ##### MACRO IANJUTA_CONTEXT_ERROR ##### -->
<para>
</para>
<!-- ##### MACRO IANJUTA_CONTEXT_LIST_ERROR ##### -->
<para>
</para>
<!-- ##### MACRO IANJUTA_CONTEXT_TEXT_ERROR ##### -->
<para>
</para>
<!-- ##### MACRO IANJUTA_CONTEXT_TREE_ERROR ##### -->
<para>
</para>
<!-- ##### MACRO IANJUTA_RENDERABLE_ERROR ##### -->
<para>
</para>
<!-- ##### MACRO IANJUTA_SAND_BOX_ERROR ##### -->
<para>
</para>
<!-- ##### MACRO IANJUTA_TRANSFORMABLE_ERROR ##### -->
<para>
</para>
<!-- ##### STRUCT IAnjutaContext ##### -->
<para>
</para>
<!-- ##### STRUCT IAnjutaContextIface ##### -->
<para>
</para>
@g_iface:
@begin:
@clear:
@end:
<!-- ##### STRUCT IAnjutaContextList ##### -->
<para>
</para>
<!-- ##### STRUCT IAnjutaContextListIface ##### -->
<para>