[anjuta/newproject: 39/40] Merge branch 'master' into newproject
- From: Sebastien Granjoux <sgranjoux src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [anjuta/newproject: 39/40] Merge branch 'master' into newproject
- Date: Tue, 16 Nov 2010 20:32:44 +0000 (UTC)
commit 5fb31c3a0602e26677849ab7bf1a319f949ca6ab
Merge: bed225e bc36896
Author: Sébastien Granjoux <seb sfo free fr>
Date: Tue Nov 16 19:16:59 2010 +0100
Merge branch 'master' into newproject
Conflicts:
plugins/Makefile.am
plugins/gbf-am/Makefile.am
plugins/mk-project/Makefile.am
plugins/project-manager/pkg-config.h
#
# It looks like you may be committing a MERGE.
# If this is not correct, please remove the file
# .git/MERGE_HEAD
# and try again.
#
# Please enter the commit message for your changes. Lines starting
# with '#' will be ignored, and an empty message aborts the commit.
# On branch newproject
# Changes to be committed:
#
# modified: Makefile.am
# modified: NEWS
# new file: anjuta.jhbuildrc
# modified: configure.ac
# modified: libanjuta/Makefile.am
# modified: libanjuta/anjuta-plugin-manager.c
# modified: libanjuta/anjuta-tabber.c
# modified: libanjuta/anjuta-utils.c
# modified: libanjuta/cell-renderer-captioned-image.c
# modified: libanjuta/e-splash.c
# modified: libanjuta/interfaces/Makefile.am.iface
# renamed: libanjuta/libanjuta-1.0.pc.in -> libanjuta/libanjuta-3.0.pc.in
# modified: manuals/anjuta-manual/de/de.po
# modified: manuals/anjuta-manual/th/th.po
# modified: manuals/reference/libanjuta/Makefile.am
# modified: plugins/Makefile.am
# modified: plugins/build-basic-autotools/anjuta-build-basic-autotools-plugin.ui
# modified: plugins/build-basic-autotools/build-options.c
# modified: plugins/class-gen/combo-flags.c
# modified: plugins/class-gen/window.c
# modified: plugins/debug-manager/Makefile.am
# modified: plugins/debug-manager/chunk_view.c
# modified: plugins/debug-manager/data_view.c
# modified: plugins/debug-manager/org.gnome.anjuta.debug-manager.gschema.xml.in
# modified: plugins/debug-manager/sharedlib.c
# modified: plugins/debug-manager/signals.c
# modified: plugins/debug-manager/sparse_view.c
# modified: plugins/debug-manager/start.c
# modified: plugins/document-manager/Makefile.am
# modified: plugins/document-manager/plugin.c
# modified: plugins/document-manager/search-box.c
# modified: plugins/file-loader/plugin.c
# modified: plugins/file-manager/file-view.c
# modified: plugins/gdb/Makefile.am
# modified: plugins/gdb/preferences.c
# modified: plugins/git/anjuta-git.ui
# modified: plugins/git/giggle-graph-renderer.c
# modified: plugins/git/git-diff-dialog.c
# modified: plugins/git/git-log-dialog.c
# modified: plugins/git/git-ui-utils.c
# modified: plugins/glade/plugin.c
# modified: plugins/language-manager/Makefile.am
# modified: plugins/language-support-cpp-java/anjuta-language-cpp-java.ui
# modified: plugins/language-support-cpp-java/plugin.c
# modified: plugins/language-support-js/Makefile.am
# modified: plugins/language-support-js/anjuta-language-javascript.ui
# modified: plugins/language-support-js/plugin.c
# modified: plugins/language-support-js/plugin.h
# new file: plugins/language-support-js/prefs.h
# modified: plugins/language-support-js/util.c
# modified: plugins/language-support-python/Makefile.am
# modified: plugins/language-support-vala/Makefile.am
# modified: plugins/language-support-vala/plugin.vala
# modified: plugins/language-support-vala/provider.vala
# modified: plugins/message-view/anjuta-msgman.c
# modified: plugins/message-view/message-view.c
# modified: plugins/message-view/plugin.c
# modified: plugins/mk-project/Makefile.am
# modified: plugins/project-manager/project-view.c
# modified: plugins/project-wizard/druid.c
# modified: plugins/project-wizard/property.c
# modified: plugins/run-program/Makefile.am
# modified: plugins/run-program/anjuta-run-program.ui
# modified: plugins/run-program/execute.c
# modified: plugins/run-program/org.gnome.anjuta.run.gschema.xml.in
# modified: plugins/run-program/parameters.c
# modified: plugins/search/anjuta-search.ui
# modified: plugins/search/search-replace.c
# modified: plugins/snippets-manager/Makefile.am
# modified: plugins/snippets-manager/plugin.c
# modified: plugins/snippets-manager/snippets-browser.c
# modified: plugins/snippets-manager/snippets-editor.c
# modified: plugins/sourceview/Makefile.am
# modified: plugins/sourceview/anjuta-view.c
# modified: plugins/sourceview/assist-tip.c
# modified: plugins/sourceview/sourceview-prefs.c
# modified: plugins/sourceview/sourceview.c
# modified: plugins/starter/starter.c
# modified: plugins/subversion/subversion-commit-dialog.c
# modified: plugins/subversion/subversion-log-dialog.c
# modified: plugins/symbol-db/Makefile.am
# modified: plugins/symbol-db/anjuta-tags/Makefile.am
# modified: plugins/symbol-db/anjuta-tags/ctags-visitor.vala
# modified: plugins/symbol-db/symbol-db-model.h
# modified: plugins/symbol-db/symbol-db-views.c
# modified: plugins/terminal/Makefile.am
# modified: plugins/terminal/terminal.c
# modified: plugins/tools/editor.c
# modified: po/LINGUAS
# modified: po/POTFILES.in
# modified: po/es.po
# modified: po/gl.po
# modified: po/ja.po
# new file: po/ug.po
# modified: scripts/builder2schema.pl
# modified: src/Makefile.am
# modified: src/anjuta-app.c
# modified: src/main.c
#
# Untracked files:
# (use "git add <file>..." to include in what will be committed)
#
# .anjuta/
# .anjuta_sym_db.db
# ABOUT-NLS
# Debug/
# INSTALL
# Makefile.in
# aclocal.m4
# compile
# config.guess
# config.h.in
# config.rpath
# config.sub
# depcomp
# gnome-doc-utils.make
# gtk-doc.make
# install-sh
# libanjuta/interfaces/Makefile.am
# libanjuta/interfaces/Makefile.in
# libanjuta/interfaces/hierarchy.txt
# libanjuta/interfaces/ianjuta-buildable.c
# libanjuta/interfaces/ianjuta-buildable.h
# libanjuta/interfaces/ianjuta-builder.c
# libanjuta/interfaces/ianjuta-builder.h
# libanjuta/interfaces/ianjuta-debug-manager.c
# libanjuta/interfaces/ianjuta-debug-manager.h
# libanjuta/interfaces/ianjuta-debugger-breakpoint.c
# libanjuta/interfaces/ianjuta-debugger-breakpoint.h
# libanjuta/interfaces/ianjuta-debugger-instruction.c
# libanjuta/interfaces/ianjuta-debugger-instruction.h
# libanjuta/interfaces/ianjuta-debugger-memory.c
# libanjuta/interfaces/ianjuta-debugger-memory.h
# libanjuta/interfaces/ianjuta-debugger-register.c
# libanjuta/interfaces/ianjuta-debugger-register.h
# libanjuta/interfaces/ianjuta-debugger-variable.c
# libanjuta/interfaces/ianjuta-debugger-variable.h
# libanjuta/interfaces/ianjuta-debugger.c
# libanjuta/interfaces/ianjuta-debugger.h
# libanjuta/interfaces/ianjuta-document-manager.c
# libanjuta/interfaces/ianjuta-document-manager.h
# libanjuta/interfaces/ianjuta-document.c
# libanjuta/interfaces/ianjuta-document.h
# libanjuta/interfaces/ianjuta-editor-assist.c
# libanjuta/interfaces/ianjuta-editor-assist.h
# libanjuta/interfaces/ianjuta-editor-cell-style.c
# libanjuta/interfaces/ianjuta-editor-cell-style.h
# libanjuta/interfaces/ianjuta-editor-cell.c
# libanjuta/interfaces/ianjuta-editor-cell.h
# libanjuta/interfaces/ianjuta-editor-comment.c
# libanjuta/interfaces/ianjuta-editor-comment.h
# libanjuta/interfaces/ianjuta-editor-convert.c
# libanjuta/interfaces/ianjuta-editor-convert.h
# libanjuta/interfaces/ianjuta-editor-factory.c
# libanjuta/interfaces/ianjuta-editor-factory.h
# libanjuta/interfaces/ianjuta-editor-folds.c
# libanjuta/interfaces/ianjuta-editor-folds.h
# libanjuta/interfaces/ianjuta-editor-goto.c
# libanjuta/interfaces/ianjuta-editor-goto.h
# libanjuta/interfaces/ianjuta-editor-hover.c
# libanjuta/interfaces/ianjuta-editor-hover.h
# libanjuta/interfaces/ianjuta-editor-language.c
# libanjuta/interfaces/ianjuta-editor-language.h
# libanjuta/interfaces/ianjuta-editor-line-mode.c
# libanjuta/interfaces/ianjuta-editor-line-mode.h
# libanjuta/interfaces/ianjuta-editor-search.c
# libanjuta/interfaces/ianjuta-editor-search.h
# libanjuta/interfaces/ianjuta-editor-selection.c
# libanjuta/interfaces/ianjuta-editor-selection.h
# libanjuta/interfaces/ianjuta-editor-tip.c
# libanjuta/interfaces/ianjuta-editor-tip.h
# libanjuta/interfaces/ianjuta-editor-view.c
# libanjuta/interfaces/ianjuta-editor-view.h
# libanjuta/interfaces/ianjuta-editor-zoom.c
# libanjuta/interfaces/ianjuta-editor-zoom.h
# libanjuta/interfaces/ianjuta-editor.c
# libanjuta/interfaces/ianjuta-editor.h
# libanjuta/interfaces/ianjuta-environment.c
# libanjuta/interfaces/ianjuta-environment.h
# libanjuta/interfaces/ianjuta-file-loader.c
# libanjuta/interfaces/ianjuta-file-loader.h
# libanjuta/interfaces/ianjuta-file-manager.c
# libanjuta/interfaces/ianjuta-file-manager.h
# libanjuta/interfaces/ianjuta-file-savable.c
# libanjuta/interfaces/ianjuta-file-savable.h
# libanjuta/interfaces/ianjuta-file.c
# libanjuta/interfaces/ianjuta-file.h
# libanjuta/interfaces/ianjuta-help.c
# libanjuta/interfaces/ianjuta-help.h
# libanjuta/interfaces/ianjuta-indicable.c
# libanjuta/interfaces/ianjuta-indicable.h
# libanjuta/interfaces/ianjuta-iterable-tree.c
# libanjuta/interfaces/ianjuta-iterable-tree.h
# libanjuta/interfaces/ianjuta-iterable.c
# libanjuta/interfaces/ianjuta-iterable.h
# libanjuta/interfaces/ianjuta-language.c
# libanjuta/interfaces/ianjuta-language.h
# libanjuta/interfaces/ianjuta-loader.c
# libanjuta/interfaces/ianjuta-loader.h
# libanjuta/interfaces/ianjuta-markable.c
# libanjuta/interfaces/ianjuta-markable.h
# libanjuta/interfaces/ianjuta-message-manager.c
# libanjuta/interfaces/ianjuta-message-manager.h
# libanjuta/interfaces/ianjuta-message-view.c
# libanjuta/interfaces/ianjuta-message-view.h
# libanjuta/interfaces/ianjuta-plugin-factory.c
# libanjuta/interfaces/ianjuta-plugin-factory.h
# libanjuta/interfaces/ianjuta-preferences.c
# libanjuta/interfaces/ianjuta-preferences.h
# libanjuta/interfaces/ianjuta-print.c
# libanjuta/interfaces/ianjuta-print.h
# libanjuta/interfaces/ianjuta-project-backend.c
# libanjuta/interfaces/ianjuta-project-backend.h
# libanjuta/interfaces/ianjuta-project-manager.c
# libanjuta/interfaces/ianjuta-project-manager.h
# libanjuta/interfaces/ianjuta-project.c
# libanjuta/interfaces/ianjuta-project.h
# libanjuta/interfaces/ianjuta-provider.c
# libanjuta/interfaces/ianjuta-provider.h
# libanjuta/interfaces/ianjuta-snippets-manager.c
# libanjuta/interfaces/ianjuta-snippets-manager.h
# libanjuta/interfaces/ianjuta-stream-loader.c
# libanjuta/interfaces/ianjuta-stream-loader.h
# libanjuta/interfaces/ianjuta-stream-savable.c
# libanjuta/interfaces/ianjuta-stream-savable.h
# libanjuta/interfaces/ianjuta-stream.c
# libanjuta/interfaces/ianjuta-stream.h
# libanjuta/interfaces/ianjuta-symbol-manager.c
# libanjuta/interfaces/ianjuta-symbol-manager.h
# libanjuta/interfaces/ianjuta-symbol-query.c
# libanjuta/interfaces/ianjuta-symbol-query.h
# libanjuta/interfaces/ianjuta-symbol.c
# libanjuta/interfaces/ianjuta-symbol.h
# libanjuta/interfaces/ianjuta-terminal.c
# libanjuta/interfaces/ianjuta-terminal.h
# libanjuta/interfaces/ianjuta-todo.c
# libanjuta/interfaces/ianjuta-todo.h
# libanjuta/interfaces/ianjuta-vcs.c
# libanjuta/interfaces/ianjuta-vcs.h
# libanjuta/interfaces/ianjuta-wizard.c
# libanjuta/interfaces/ianjuta-wizard.h
# libanjuta/interfaces/iface-built.stamp
# libanjuta/interfaces/libanjuta-iface-marshallers.c
# libanjuta/interfaces/libanjuta-iface-marshallers.h
# libanjuta/interfaces/libanjuta-iface-marshallers.list
# libanjuta/interfaces/libanjuta-interfaces.h
# libfoocanvas/Makefile.in
# ltmain.sh
# m4/gnome-doc-utils.m4
# m4/intltool.m4
# manuals/reference/libanjuta/libanjuta-sections.txt
# manuals/reference/libanjuta/libanjuta.types
# manuals/reference/libanjuta/tmpl/
# missing
# mkinstalldirs
# module.patch
# omf.make
# pixmaps/16x16/Makefile.in
# pixmaps/22x22/Makefile.in
# pixmaps/24x24/Makefile.in
# pixmaps/32x32/Makefile.in
# pixmaps/48x48/Makefile.in
# pixmaps/scalable/Makefile.in
# plugins/am-project/tests/Makefile.am~
# plugins/am-project/tests/Makefile.in
# plugins/am-project/tests/group.at~
# plugins/am-project/tests/package.at~
# plugins/am-project/tests/package.m4
# plugins/am-project/tests/testsuite
# plugins/class-inheritance/Makefile.in
# plugins/glade/Makefile.in
# plugins/gtodo/Makefile.in
# plugins/js-debugger/Makefile.in
# plugins/language-support-cpp-java/cxxparser/Makefile.in
# plugins/language-support-js/Makefile.in
# plugins/language-support-python/Makefile.in
# plugins/mk-project/Makefile.am~
# plugins/mk-project/Makefile.in
# plugins/project-wizard/templates/js_minimal/Makefile.in
# plugins/project-wizard/templates/js_minimal/src/Makefile.in
# plugins/symbol-db/anjuta-tags/Makefile.in
# plugins/symbol-db/benchmark/Makefile.in
# po/Makefile.in.in~
# po/Makevars.template
# po/Rules-quot
# po/boldquot.sed
# po/en boldquot header
# po/en quot header
# po/insert-header.sin
# po/quot.sed
# po/remove-potcdate.sin
# xmldocs.make
# ylwrap
Makefile.am | 2 +-
NEWS | 31 +
anjuta.jhbuildrc | 34 +
configure.ac | 115 +-
libanjuta/Makefile.am | 60 +-
libanjuta/anjuta-plugin-manager.c | 2 +-
libanjuta/anjuta-tabber.c | 74 +-
libanjuta/anjuta-utils.c | 5 +-
libanjuta/cell-renderer-captioned-image.c | 21 +-
libanjuta/e-splash.c | 35 +-
libanjuta/interfaces/Makefile.am.iface | 6 +-
.../{libanjuta-1.0.pc.in => libanjuta-3.0.pc.in} | 8 +-
manuals/anjuta-manual/de/de.po | 1113 +--
manuals/anjuta-manual/th/th.po | 79 +-
manuals/reference/libanjuta/Makefile.am | 2 +-
plugins/Makefile.am | 56 +-
.../anjuta-build-basic-autotools-plugin.ui | 3 +-
plugins/build-basic-autotools/build-options.c | 6 +-
plugins/class-gen/combo-flags.c | 10 +-
plugins/class-gen/window.c | 2 +-
plugins/debug-manager/Makefile.am | 1 +
plugins/debug-manager/chunk_view.c | 2 -
plugins/debug-manager/data_view.c | 54 +-
.../org.gnome.anjuta.debug-manager.gschema.xml.in | 2 +-
plugins/debug-manager/sharedlib.c | 6 +-
plugins/debug-manager/signals.c | 6 +-
plugins/debug-manager/sparse_view.c | 190 +-
plugins/debug-manager/start.c | 6 +-
plugins/document-manager/Makefile.am | 3 +-
plugins/document-manager/plugin.c | 24 +-
plugins/document-manager/search-box.c | 52 +-
plugins/file-loader/plugin.c | 14 +-
plugins/file-manager/file-view.c | 2 +-
plugins/gdb/Makefile.am | 6 +-
plugins/gdb/preferences.c | 4 +-
plugins/git/anjuta-git.ui | 2 -
plugins/git/giggle-graph-renderer.c | 25 +-
plugins/git/git-diff-dialog.c | 7 +-
plugins/git/git-log-dialog.c | 2 +-
plugins/git/git-ui-utils.c | 1 -
plugins/glade/plugin.c | 2 +-
plugins/language-manager/Makefile.am | 5 +-
.../anjuta-language-cpp-java.ui | 24 +-
plugins/language-support-cpp-java/plugin.c | 44 +-
plugins/language-support-js/Makefile.am | 11 +-
.../anjuta-language-javascript.ui | 2 +-
plugins/language-support-js/plugin.c | 15 +-
plugins/language-support-js/plugin.h | 2 +-
plugins/language-support-js/prefs.h | 30 +
plugins/language-support-js/util.c | 13 +-
plugins/language-support-python/Makefile.am | 3 +-
plugins/language-support-vala/Makefile.am | 2 +-
plugins/language-support-vala/plugin.vala | 68 +-
plugins/language-support-vala/provider.vala | 4 +-
plugins/message-view/anjuta-msgman.c | 33 +-
plugins/message-view/message-view.c | 4 +-
plugins/message-view/plugin.c | 5 +-
plugins/mk-project/Makefile.am | 5 +-
plugins/project-manager/project-view.c | 27 +-
plugins/project-wizard/druid.c | 2 +-
plugins/project-wizard/property.c | 4 +-
plugins/run-program/Makefile.am | 3 +-
plugins/run-program/anjuta-run-program.ui | 14 +-
plugins/run-program/execute.c | 1 -
.../org.gnome.anjuta.run.gschema.xml.in | 2 +-
plugins/run-program/parameters.c | 4 +-
plugins/search/anjuta-search.ui | 22 +-
plugins/search/search-replace.c | 12 +-
plugins/snippets-manager/Makefile.am | 4 +-
plugins/snippets-manager/plugin.c | 28 +-
plugins/snippets-manager/snippets-browser.c | 48 +-
plugins/snippets-manager/snippets-editor.c | 30 +-
plugins/sourceview/Makefile.am | 3 +-
plugins/sourceview/anjuta-view.c | 30 +-
plugins/sourceview/assist-tip.c | 2 +-
plugins/sourceview/sourceview-prefs.c | 5 +-
plugins/sourceview/sourceview.c | 13 +-
plugins/starter/starter.c | 23 +-
plugins/subversion/subversion-commit-dialog.c | 4 +-
plugins/subversion/subversion-log-dialog.c | 2 +-
plugins/symbol-db/Makefile.am | 4 +-
plugins/symbol-db/anjuta-tags/Makefile.am | 6 +-
plugins/symbol-db/anjuta-tags/ctags-visitor.vala | 6 +-
plugins/symbol-db/symbol-db-model.h | 2 +-
plugins/symbol-db/symbol-db-views.c | 2 +-
plugins/terminal/Makefile.am | 1 -
plugins/terminal/terminal.c | 48 +-
plugins/tools/editor.c | 20 +-
po/LINGUAS | 1 +
po/POTFILES.in | 1 +
po/es.po | 13 +-
po/gl.po | 386 +-
po/ja.po | 282 +-
po/ug.po |10453 ++++++++++++++++++++
scripts/builder2schema.pl | 2 +-
src/Makefile.am | 12 +-
src/anjuta-app.c | 24 +-
src/main.c | 4 -
98 files changed, 12163 insertions(+), 1732 deletions(-)
---
diff --cc configure.ac
index 478b3b4,b0b7d8b..59ff79b
--- a/configure.ac
+++ b/configure.ac
@@@ -179,9 -163,33 +172,10 @@@ dnl Check for autoge
dnl -----------------
AC_PATH_PROG(AUTOGEN_PATH, autogen,no)
if test x$AUTOGEN_PATH = xno; then
- AC_MSG_ERROR([Couldn't find autogen, please install the autogen package. You can get it from http://autogen.sourceforge.net/])
+ AC_MSG_WARN([Couldn't find autogen. You will be able to build anjuta without autogen \
+ but several things won't work. You can get it from http://autogen.sourceforge.net/])
fi
-dnl Check for perl required by gbf-am/mkfile
-dnl ----------------------------------------
-# Automake backend requirements
-# Also needed by Makefile backend
-AC_PATH_PROG(PERL, perl)
-if test -z "$PERL"; then
- AC_MSG_ERROR([perl not found])
-fi
-$PERL -e 'require 5.005;' || {
- AC_MSG_ERROR([perl 5.005 or better is required])
-}
-
-# Check for perl Locale::gettext module
-if test "x$PERL" != x; then
- AC_MSG_CHECKING(for perl module Locale::gettext)
- $PERL "-MLocale::gettext" -e exit > /dev/null 2>&1
- if test $? -ne 0; then
- AC_MSG_ERROR([not found, you should installed perl-gettext package for your distribution]);
- else
- AC_MSG_RESULT(ok);
- fi
-fi
-
dnl Check for Devhelp
dnl -----------------
@@@ -840,9 -846,14 +839,8 @@@ plugins/js-debugger/Makefil
plugins/file-manager/Makefile
plugins/file-loader/Makefile
plugins/file-wizard/Makefile
- plugins/terminal/Makefile
plugins/build-basic-autotools/Makefile
plugins/project-manager/Makefile
-plugins/gbf-am/Makefile
-plugins/gbf-am/gbf-am-parse
-plugins/gbf-am/GBF/Makefile
-plugins/gbf-mkfile/Makefile
-plugins/gbf-mkfile/gbf-mkfile-parse
-plugins/gbf-mkfile/GBF/Makefile
plugins/symbol-db/benchmark/Makefile
plugins/symbol-db/benchmark/symbol-db/Makefile
plugins/symbol-db/benchmark/libgda/Makefile
diff --cc plugins/Makefile.am
index 443aa52,63c5d25..9bf8439
--- a/plugins/Makefile.am
+++ b/plugins/Makefile.am
@@@ -1,41 -1,42 +1,41 @@@
## The '.' is to make sure install-data-hook rule is executed first
+ ## Please keep sorted!
SUBDIRS = . \
- message-view \
- gdb \
- debug-manager \
- file-manager \
- terminal \
++ am-project \
build-basic-autotools \
+ class-gen \
+ cvs-plugin \
+ devhelp \
+ debug-manager \
+ dir-project \
+ document-manager \
file-loader \
+ file-manager \
file-wizard \
- project-wizard \
- project-manager \
- cvs-plugin \
- snippets-manager \
- class-gen \
- class-inheritance \
- gbf-am \
- gbf-mkfile \
+ gdb \
+ git \
+ glade \
+ js-debugger \
+ language-manager \
+ language-support-cpp-java \
+ language-support-js \
+ language-support-python \
+ language-support-vala \
+ message-view \
patch \
- subversion \
project-import \
- tools \
- document-manager \
+ project-manager \
+ project-wizard \
+ python-loader \
+ run-program \
search \
- language-support-cpp-java \
- language-support-python \
- glade \
- devhelp \
- language-manager \
- symbol-db \
- git \
+ snippets-manager \
sourceview \
- run-program \
starter \
- am-project \
- dir-project \
- js-debugger \
- language-support-vala \
- python-loader
- # language-support-js
+ subversion \
+ symbol-db \
+ terminal \
+ tools
-include $(top_srcdir)/git.mk
diff --cc plugins/mk-project/Makefile.am
index 5bb2353,8475cbf..37adcfe
--- a/plugins/mk-project/Makefile.am
+++ b/plugins/mk-project/Makefile.am
@@@ -21,42 -25,30 +21,43 @@@ AM_CPPFLAGS =
$(WARN_CFLAGS) \
$(DEPRECATED_FLAGS) \
$(GIO_CFLAGS) \
- $(LIBXML_CFLAGS) \
+ $(XML_CFLAGS) \
$(LIBANJUTA_CFLAGS) \
- -DSCRIPTS_DIR=\"$(scriptsdir)\"
+ -DG_LOG_DOMAIN=\"mk-project\"
plugin_LTLIBRARIES = \
- libgbf-mkfile.la
+ libmk-project.la
-libgbf_mkfile_la_SOURCES = \
+libmk_project_la_SOURCES = \
plugin.c \
plugin.h \
- gbf-mkfile-project.c \
- gbf-mkfile-project.h \
- gbf-mkfile-config.c \
- gbf-mkfile-config.h \
- gbf-mkfile-properties.c \
- gbf-mkfile-properties.h
+ mk-project.c \
+ mk-project.h \
+ mk-scanner.l \
+ mk-parser.y \
+ mk-scanner.h \
+ mk-rule.c \
+ mk-rule.h \
+ mk-project-private.h
-libgbf_mkfile_la_LDFLAGS = $(ANJUTA_PLUGIN_LDFLAGS)
+libmk_project_la_LDFLAGS = $(ANJUTA_PLUGIN_LDFLAGS)
-libgbf_mkfile_la_LIBADD = \
+libmk_project_la_LIBADD = \
$(GIO_LIBS) \
- $(LIBANJUTA_LIBS)
+ $(LIBANJUTA_LIBS) \
+ $(XML_LIBS)
+AM_YFLAGS = -t -v -g -rall
+
+mk-scanner.c: $(srcdir)/mk-scanner.l mk-parser.c
+ $(LEXCOMPILE) -o $@ $<
+
+mk-parser.c: $(srcdir)/mk-parser.y
+ $(YACCCOMPILE) -o $@ $<
+
+mk-scanner.h: mk-parser.c
+
+
EXTRA_DIST = \
$(plugin_in_files) \
$(plugin_DATA) \
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
