From 2099e58f92de651763a2679532a10a923492cd90 Mon Sep 17 00:00:00 2001 From: Yevgen Muntyan <17531749+muntyan@users.noreply.github.com> Date: Fri, 3 Sep 2010 21:36:32 -0700 Subject: [PATCH] Do not use subdirectories for compilation --- Makefile.am | 1 - configure.ac | 15 +- m4/moo-flags.m4 | 48 ++-- moo/Makefile.am | 118 +++++----- moo/eggsmclient/Makefile.am | 27 --- moo/eggsmclient/Makefile.incl | 19 ++ moo/gtksourceview/Makefile.am | 40 ---- moo/gtksourceview/Makefile.incl | 32 +++ .../Makefile.am => medit-app/Makefile.incl} | 44 ++-- moo/{medit => medit-app}/Makefile.ug | 16 -- .../data/encodings/ASCII.1 | 0 .../data/encodings/ASCII.2 | 0 .../data/encodings/GB2312 | 0 .../data/encodings/KOI8-R.1 | 0 .../data/encodings/UCS-4.1 | 0 .../data/encodings/UCS-4.2 | Bin .../data/encodings/UCS-4.3 | Bin .../data/encodings/UCS-4.4 | Bin .../data/encodings/UTF-16.1 | 0 .../data/encodings/UTF-16.2 | Bin .../data/encodings/UTF-16.3 | Bin .../data/encodings/UTF-16.4 | Bin .../data/encodings/UTF-8.1 | 0 .../data/encodings/UTF-8.2 | 0 .../data/encodings/UTF-8.3 | 0 .../data/encodings/UTF-8.4 | 0 .../data/encodings/UTF-8.5 | 0 .../data/encodings/Windows-1251.1 | 0 moo/{medit => medit-app}/data/gobject.lua | 0 moo/{medit => medit-app}/data/lua/munit.lua | 0 moo/{medit => medit-app}/data/mooedit.lua | 0 moo/{medit => medit-app}/data/testunicode.lua | 0 moo/{medit => medit-app}/data/testustring.lua | 0 moo/{medit => medit-app}/data/textview.lua | 0 moo/{medit => medit-app}/main.c | 0 .../medit-project.desktop.in | 0 moo/{medit => medit-app}/medit.desktop.in | 0 moo/{medit => medit-app}/medit.rc.in | 0 moo/{medit => medit-app}/mem-debug.h | 0 moo/{medit => medit-app}/parse.h | 0 moo/{medit => medit-app}/run-tests.h | 3 +- moo/{medit => medit-app}/run-tests.sh | 0 moo/mooapp/Makefile.am | 42 ---- moo/mooapp/Makefile.incl | 26 +++ moo/mooapp/mooappabout.c | 6 +- moo/mooedit/Makefile.am | 156 ------------- moo/mooedit/Makefile.incl | 127 +++++++++++ moo/mooedit/langs/Makefile.incl | 158 ++++++------- moo/mooedit/mooedit.c | 2 +- moo/mooedit/mooeditdialogs.c | 4 +- moo/mooedit/mooeditprefspage.c | 10 +- moo/mooedit/mooeditwindow.c | 2 +- moo/mooedit/mooplugin.c | 2 +- moo/mooedit/mooprintpreview.c | 2 +- moo/mooedit/mootextfind.c | 4 +- moo/mooedit/mootextprint.c | 2 +- moo/mooedit/mootextview.c | 2 +- moo/moofileview/Makefile.am | 68 ------ moo/moofileview/Makefile.incl | 51 +++++ moo/moofileview/moobookmarkmgr.c | 2 +- moo/moofileview/moofileview-dialogs.c | 6 +- moo/moolua/Makefile.am | 83 ------- moo/moolua/Makefile.incl | 78 +++++++ moo/moolua/moo-tests-lua.h | 2 +- moo/mooutils/Makefile.am | 210 ------------------ moo/mooutils/Makefile.incl | 197 ++++++++++++++++ moo/mooutils/mooaccelbutton.c | 2 +- moo/mooutils/mooaccelprefs.c | 2 +- moo/mooutils/mooutils-misc.c | 2 +- moo/plugins/Makefile.am | 44 ---- moo/plugins/Makefile.incl | 26 +++ moo/plugins/ctags/Makefile.incl | 19 +- moo/plugins/moofileselector-prefs.c | 2 +- moo/plugins/moofileselector.c | 2 +- moo/plugins/moofind.c | 4 +- moo/plugins/script/Makefile.am | 28 --- moo/plugins/script/Makefile.incl | 20 ++ moo/plugins/usertools/Makefile.am | 50 ----- moo/plugins/usertools/Makefile.incl | 37 +++ moo/plugins/usertools/exe/Makefile.incl | 11 +- moo/plugins/usertools/exe/moocommand-exe.c | 2 +- moo/plugins/usertools/exe/moocommand-exe.h | 2 +- moo/plugins/usertools/lua/Makefile.incl | 31 ++- moo/plugins/usertools/lua/moocommand-lua.cpp | 2 +- moo/plugins/usertools/lua/moocommand-lua.h | 2 +- moo/plugins/usertools/moousertools-prefs.c | 2 +- moo/xdgmime/Makefile.am | 22 -- moo/xdgmime/Makefile.incl | 16 ++ po-gsv/POTFILES.skip | 4 +- po/POTFILES.in | 36 +-- tools/rules.mk | 8 - 91 files changed, 897 insertions(+), 1084 deletions(-) delete mode 100644 moo/eggsmclient/Makefile.am create mode 100644 moo/eggsmclient/Makefile.incl delete mode 100644 moo/gtksourceview/Makefile.am create mode 100644 moo/gtksourceview/Makefile.incl rename moo/{medit/Makefile.am => medit-app/Makefile.incl} (65%) rename moo/{medit => medit-app}/Makefile.ug (80%) rename moo/{medit => medit-app}/data/encodings/ASCII.1 (100%) rename moo/{medit => medit-app}/data/encodings/ASCII.2 (100%) rename moo/{medit => medit-app}/data/encodings/GB2312 (100%) rename moo/{medit => medit-app}/data/encodings/KOI8-R.1 (100%) rename moo/{medit => medit-app}/data/encodings/UCS-4.1 (100%) rename moo/{medit => medit-app}/data/encodings/UCS-4.2 (100%) rename moo/{medit => medit-app}/data/encodings/UCS-4.3 (100%) rename moo/{medit => medit-app}/data/encodings/UCS-4.4 (100%) rename moo/{medit => medit-app}/data/encodings/UTF-16.1 (100%) rename moo/{medit => medit-app}/data/encodings/UTF-16.2 (100%) rename moo/{medit => medit-app}/data/encodings/UTF-16.3 (100%) rename moo/{medit => medit-app}/data/encodings/UTF-16.4 (100%) rename moo/{medit => medit-app}/data/encodings/UTF-8.1 (100%) rename moo/{medit => medit-app}/data/encodings/UTF-8.2 (100%) rename moo/{medit => medit-app}/data/encodings/UTF-8.3 (100%) rename moo/{medit => medit-app}/data/encodings/UTF-8.4 (100%) rename moo/{medit => medit-app}/data/encodings/UTF-8.5 (100%) rename moo/{medit => medit-app}/data/encodings/Windows-1251.1 (100%) rename moo/{medit => medit-app}/data/gobject.lua (100%) rename moo/{medit => medit-app}/data/lua/munit.lua (100%) rename moo/{medit => medit-app}/data/mooedit.lua (100%) rename moo/{medit => medit-app}/data/testunicode.lua (100%) rename moo/{medit => medit-app}/data/testustring.lua (100%) rename moo/{medit => medit-app}/data/textview.lua (100%) rename moo/{medit => medit-app}/main.c (100%) rename moo/{medit => medit-app}/medit-project.desktop.in (100%) rename moo/{medit => medit-app}/medit.desktop.in (100%) rename moo/{medit => medit-app}/medit.rc.in (100%) rename moo/{medit => medit-app}/mem-debug.h (100%) rename moo/{medit => medit-app}/parse.h (100%) rename moo/{medit => medit-app}/run-tests.h (97%) rename moo/{medit => medit-app}/run-tests.sh (100%) delete mode 100644 moo/mooapp/Makefile.am create mode 100644 moo/mooapp/Makefile.incl delete mode 100644 moo/mooedit/Makefile.am create mode 100644 moo/mooedit/Makefile.incl delete mode 100644 moo/moofileview/Makefile.am create mode 100644 moo/moofileview/Makefile.incl delete mode 100644 moo/moolua/Makefile.am create mode 100644 moo/moolua/Makefile.incl delete mode 100644 moo/mooutils/Makefile.am create mode 100644 moo/mooutils/Makefile.incl delete mode 100644 moo/plugins/Makefile.am create mode 100644 moo/plugins/Makefile.incl delete mode 100644 moo/plugins/script/Makefile.am create mode 100644 moo/plugins/script/Makefile.incl delete mode 100644 moo/plugins/usertools/Makefile.am create mode 100644 moo/plugins/usertools/Makefile.incl delete mode 100644 moo/xdgmime/Makefile.am create mode 100644 moo/xdgmime/Makefile.incl delete mode 100644 tools/rules.mk diff --git a/Makefile.am b/Makefile.am index 2b3c9c38..4b07ca06 100644 --- a/Makefile.am +++ b/Makefile.am @@ -15,7 +15,6 @@ endif MOO_OS_UNIX EXTRA_DIST += \ tools/genenums.py \ tools/glade2c.py \ - tools/rules.mk \ tools/xml2h.py CLEANFILES = configargs.h diff --git a/configure.ac b/configure.ac index 8f25100b..0fbab05d 100644 --- a/configure.ac +++ b/configure.ac @@ -79,6 +79,9 @@ AC_DEFINE(MOO_BUILD_LUA,[1],[MOO_BUILD_LUA]) AC_DEFINE(MOO_BUILD_UTILS,[1],[MOO_BUILD_UTILS]) AM_CONDITIONAL(MOO_BUILD_CTAGS, [$MOO_OS_UNIX]) +if $MOO_OS_UNIX; then + AC_DEFINE(MOO_BUILD_CTAGS, 1, [build ctags plugin]) +fi AC_DEFINE_UNQUOTED(MOO_VERSION,["$MOO_VERSION"],[MOO_VERSION]) AC_DEFINE_UNQUOTED(MOO_DISPLAY_VERSION,["$MOO_DISPLAY_VERSION"],[MOO_DISPLAY_VERSION]) @@ -101,17 +104,5 @@ AC_CONFIG_FILES([ po/Makefile.in po-gsv/Makefile.in moo/Makefile - moo/xdgmime/Makefile - moo/mooutils/Makefile - moo/moolua/Makefile - moo/moofileview/Makefile - moo/gtksourceview/Makefile - moo/mooedit/Makefile - moo/eggsmclient/Makefile - moo/mooapp/Makefile - moo/medit/Makefile - moo/plugins/Makefile - moo/plugins/script/Makefile - moo/plugins/usertools/Makefile ]) AC_OUTPUT diff --git a/m4/moo-flags.m4 b/m4/moo-flags.m4 index 3c985807..08405746 100644 --- a/m4/moo-flags.m4 +++ b/m4/moo-flags.m4 @@ -54,33 +54,6 @@ AC_DEFUN_ONCE([MOO_AC_DEBUG],[ MOO_DEBUG_ENABLED="no" -AC_ARG_ENABLE(tests, - AC_HELP_STRING([--enable-tests],[build test programs (default = NO)]),[ - if test "x$enable_tests" = "xno"; then - MOO_ENABLE_TESTS="no" - else - MOO_ENABLE_TESTS="yes" - fi - ],[ - MOO_ENABLE_TESTS="no" -]) -AM_CONDITIONAL(MOO_ENABLE_TESTS, test x$MOO_ENABLE_TESTS = "xyes") - -AC_ARG_ENABLE(unit-tests, - AC_HELP_STRING([--enable-unit-tests],[build unit tests (default = NO)]),[ - if test "x$enable_unit_tests" = "xno"; then - MOO_ENABLE_UNIT_TESTS="no" - else - MOO_ENABLE_UNIT_TESTS="yes" - fi - ],[ - MOO_ENABLE_UNIT_TESTS="no" -]) -AM_CONDITIONAL(MOO_ENABLE_UNIT_TESTS, test x$MOO_ENABLE_UNIT_TESTS = "xyes") -if test "x$MOO_ENABLE_UNIT_TESTS" = "xyes"; then - AC_DEFINE(MOO_ENABLE_UNIT_TESTS, 1, [Enable unit tests]) -fi - AC_ARG_ENABLE(debug, AC_HELP_STRING([--enable-debug],[enable debug options (default = NO)]),[ if test "x$enable_debug" = "xno"; then @@ -101,10 +74,25 @@ AC_ARG_ENABLE(dev-mode, MOO_DEV_MODE="yes" fi ],[ - MOO_DEV_MODE="$MOO_DEBUG_ENABLED" + MOO_DEV_MODE="$MOO_DEBUG_ENABLED" ]) AM_CONDITIONAL(MOO_DEV_MODE, test x$MOO_DEV_MODE = "xyes") +AC_ARG_ENABLE(unit-tests, + AC_HELP_STRING([--enable-unit-tests],[build unit tests (default = NO)]),[ + if test "x$enable_unit_tests" = "xno"; then + MOO_ENABLE_UNIT_TESTS="no" + else + MOO_ENABLE_UNIT_TESTS="yes" + fi + ],[ + MOO_ENABLE_UNIT_TESTS="$MOO_DEV_MODE" +]) +AM_CONDITIONAL(MOO_ENABLE_UNIT_TESTS, test x$MOO_ENABLE_UNIT_TESTS = "xyes") +if test "x$MOO_ENABLE_UNIT_TESTS" = "xyes"; then + MOO_CPPFLAGS="$MOO_CPPFLAGS -DMOO_ENABLE_UNIT_TESTS" +fi + MOO_COMPILER _MOO_AC_CHECK_COMPILER_OPTIONS([dnl @@ -160,10 +148,6 @@ MOO_CPPFLAGS="$MOO_CPPFLAGS -DENABLE_DEBUG -DENABLE_PROFILE -DG_ENABLE_DEBUG dnl else MOO_CPPFLAGS="$MOO_CPPFLAGS -DNDEBUG=1 -DG_DISABLE_CAST_CHECKS -DG_DISABLE_ASSERT" fi - -if test "x$MOO_ENABLE_TESTS" = "xyes"; then - MOO_CPPFLAGS="$MOO_CPPFLAGS -DMOO_ENABLE_TESTS" -fi ]) ############################################################################## diff --git a/moo/Makefile.am b/moo/Makefile.am index 783b2c49..007ecea1 100644 --- a/moo/Makefile.am +++ b/moo/Makefile.am @@ -1,62 +1,70 @@ -EXTRA_DIST = moo-config.h +EXTRA_DIST = +BUILT_SOURCES = +CLEANFILES = + +AM_CPPFLAGS = $(MOO_CPPFLAGS) -I$(top_srcdir)/doc -Imooutils/glade +AM_CFLAGS = $(MOO_CFLAGS) +AM_CXXFLAGS = $(MOO_CXXFLAGS) + +moo_sources = +built_moo_sources = +moo_libadd = + +plugins_sources = +built_plugins_sources = + +moo_srcdir = $(srcdir) +moo_builddir = . + +moo_sources += moo-config.h EXTRA_DIST += marshals.list -BUILT_SOURCES = marshals.h -CLEANFILES = marshals.h +built_moo_sources += marshals.h marshals.h: marshals.list $(GLIB_GENMARSHAL) --prefix=_moo_marshal --header $(srcdir)/marshals.list > marshals.h.tmp \ && mv marshals.h.tmp marshals.h -# noinst_LTLIBRARIES = libmoo.la -# -# AM_CPPFLAGS = $(MOO_CPPFLAGS) -# AM_CFLAGS = $(MOO_CFLAGS) -# AM_CXXFLAGS = $(MOO_CXXFLAGS) -# -# libmoo_la_LIBADD = \ -# mooapp/libmooapp.la \ -# eggsmclient/libeggsmclient.la \ -# mooedit/libmooedit.la \ -# gtksourceview/libgtksourceview.la \ -# moofileview/libmoofileview.la \ -# moolua/libmoolua.la \ -# mooutils/libmooutils.la \ -# xdgmime/libxdgmime.la -# -# libmoo_la_SOURCES = \ -# marshals.c \ -# marshals.h \ -# moo-config.h -# -# EXTRA_DIST = marshals.list -# -# BUILT_SOURCES = \ -# marshals.c \ -# marshals.h -# -# marshals.c: marshals.list -# echo '#include "marshals.h"' > marshals.c.tmp -# $(GLIB_GENMARSHAL) --prefix=_moo_marshal --body $(srcdir)/marshals.list >> marshals.c.tmp -# cmp -s marshals.c.tmp marshals.c || mv marshals.c.tmp marshals.c -# rm -f marshals.c.tmp -# -# marshals.h: marshals.list -# $(GLIB_GENMARSHAL) --prefix=_moo_marshal --header $(srcdir)/marshals.list > marshals.h.tmp -# cmp -s marshals.h.tmp marshals.h || mv marshals.h.tmp marshals.h -# rm -f marshals.h.tmp -# -# CLEANFILES = \ -# marshals.c \ -# marshals.h +include xdgmime/Makefile.incl +include mooutils/Makefile.incl +include moolua/Makefile.incl +include moofileview/Makefile.incl +include gtksourceview/Makefile.incl +include mooedit/Makefile.incl +include eggsmclient/Makefile.incl +include mooapp/Makefile.incl +include plugins/Makefile.incl +include medit-app/Makefile.incl -SUBDIRS = \ - xdgmime \ - mooutils \ - moolua \ - moofileview \ - gtksourceview \ - mooedit \ - eggsmclient \ - mooapp \ - plugins \ - medit +BUILT_SOURCES += $(built_moo_sources) $(built_plugin_sources) +CLEANFILES += $(built_moo_sources) $(built_plugin_sources) + +# glade/%-gxml.h: glade/%.glade $(top_srcdir)/tools/glade2c.py +# $(MKDIR_P) glade +# $(PYTHON) $(top_srcdir)/tools/glade2c.py $< > $@.tmp && mv $@.tmp $@ + +%-gxml.h: mooutils/glade/%.glade $(top_srcdir)/tools/glade2c.py + $(PYTHON) $(top_srcdir)/tools/glade2c.py $< > $@.tmp && mv $@.tmp $@ + +%-gxml.h: moofileview/glade/%.glade $(top_srcdir)/tools/glade2c.py + $(PYTHON) $(top_srcdir)/tools/glade2c.py $< > $@.tmp && mv $@.tmp $@ + +%-gxml.h: mooedit/glade/%.glade $(top_srcdir)/tools/glade2c.py + $(PYTHON) $(top_srcdir)/tools/glade2c.py $< > $@.tmp && mv $@.tmp $@ + +%-gxml.h: mooapp/glade/%.glade $(top_srcdir)/tools/glade2c.py + $(PYTHON) $(top_srcdir)/tools/glade2c.py $< > $@.tmp && mv $@.tmp $@ + +%-gxml.h: plugins/glade/%.glade $(top_srcdir)/tools/glade2c.py + $(PYTHON) $(top_srcdir)/tools/glade2c.py $< > $@.tmp && mv $@.tmp $@ + +%-gxml.h: plugins/usertools/glade/%.glade $(top_srcdir)/tools/glade2c.py + $(PYTHON) $(top_srcdir)/tools/glade2c.py $< > $@.tmp && mv $@.tmp $@ + +# %-ui.h: %.xml $(top_srcdir)/tools/xml2h.py +# $(PYTHON) $(top_srcdir)/tools/xml2h.py $< $@.tmp $*_ui_xml && mv $@.tmp $@ + +%-ui.h: moofileview/%.xml $(top_srcdir)/tools/xml2h.py + $(PYTHON) $(top_srcdir)/tools/xml2h.py $< $@.tmp $*_ui_xml && mv $@.tmp $@ + +%-ui.h: mooedit/%.xml $(top_srcdir)/tools/xml2h.py + $(PYTHON) $(top_srcdir)/tools/xml2h.py $< $@.tmp $*_ui_xml && mv $@.tmp $@ diff --git a/moo/eggsmclient/Makefile.am b/moo/eggsmclient/Makefile.am deleted file mode 100644 index 52e9f790..00000000 --- a/moo/eggsmclient/Makefile.am +++ /dev/null @@ -1,27 +0,0 @@ -noinst_LTLIBRARIES = libeggsmclient.la - -AM_CPPFLAGS = $(MOO_CPPFLAGS) -AM_CFLAGS = $(MOO_CFLAGS) -AM_CXXFLAGS = $(MOO_CXXFLAGS) - -libeggsmclient_la_LIBADD = - -libeggsmclient_la_SOURCES = \ - eggsmclient.c \ - eggsmclient.h \ - eggsmclient-mangle.h \ - eggsmclient-private.h - -if MOO_OS_WIN32 - libeggsmclient_la_SOURCES += eggsmclient-win32.c -else !MOO_OS_WIN32 -if MOO_OS_DARWIN - libeggsmclient_la_SOURCES += eggsmclient-dummy.c -else !MOO_OS_DARWIN - AM_CFLAGS += -DEGG_SM_CLIENT_BACKEND_XSMP - libeggsmclient_la_SOURCES += eggsmclient-xsmp.c eggdesktopfile.h eggdesktopfile.c - libeggsmclient_la_LIBADD += -lICE -lSM -endif !MOO_OS_DARWIN -endif !MOO_OS_WIN32 - -# -%- strip:true -%- diff --git a/moo/eggsmclient/Makefile.incl b/moo/eggsmclient/Makefile.incl new file mode 100644 index 00000000..7e8b1ca3 --- /dev/null +++ b/moo/eggsmclient/Makefile.incl @@ -0,0 +1,19 @@ +moo_sources += \ + eggsmclient/eggsmclient.c \ + eggsmclient/eggsmclient.h \ + eggsmclient/eggsmclient-mangle.h \ + eggsmclient/eggsmclient-private.h + +if MOO_OS_WIN32 +moo_sources += eggsmclient/eggsmclient-win32.c +else !MOO_OS_WIN32 +if MOO_OS_DARWIN +moo_sources += eggsmclient/eggsmclient-dummy.c +else !MOO_OS_DARWIN +AM_CFLAGS += -DEGG_SM_CLIENT_BACKEND_XSMP +moo_sources += eggsmclient/eggsmclient-xsmp.c eggsmclient/eggdesktopfile.h eggsmclient/eggdesktopfile.c +moo_libadd += -lICE -lSM +endif !MOO_OS_DARWIN +endif !MOO_OS_WIN32 + +# -%- strip:true -%- diff --git a/moo/gtksourceview/Makefile.am b/moo/gtksourceview/Makefile.am deleted file mode 100644 index 88b269f5..00000000 --- a/moo/gtksourceview/Makefile.am +++ /dev/null @@ -1,40 +0,0 @@ -noinst_LTLIBRARIES = libgtksourceview.la - -AM_CPPFLAGS = $(MOO_CPPFLAGS) -AM_CFLAGS = $(MOO_CFLAGS) -AM_CXXFLAGS = $(MOO_CXXFLAGS) - -libgtksourceview_la_SOURCES = \ - gtksourcecontextengine.c \ - gtksourcecontextengine.h \ - gtksourceengine.c \ - gtksourceengine.h \ - gtksourceiter.c \ - gtksourceiter.h \ - gtksourcelanguage-parser-1.c \ - gtksourcelanguage-parser-2.c \ - gtksourcelanguage-private.h \ - gtksourcelanguage.c \ - gtksourcelanguage.h \ - gtksourcelanguagemanager.c \ - gtksourcelanguagemanager.h \ - gtksourcestyle-private.h \ - gtksourcestyle.c \ - gtksourcestyle.h \ - gtksourcestylescheme.c \ - gtksourcestylescheme.h \ - gtksourcestyleschememanager.c \ - gtksourcestyleschememanager.h \ - gtksourceview-utils.c \ - gtksourceview-utils.h \ - gtktextregion.c \ - gtktextregion.h - -libgtksourceview_la_SOURCES += \ - gtksourceview-i18n.h \ - gtksourceview-marshal.h \ - gtksourceview-api.h \ - gtksourcebuffer.h \ - gtksourceview.h - -# -%- strip:true -%- diff --git a/moo/gtksourceview/Makefile.incl b/moo/gtksourceview/Makefile.incl new file mode 100644 index 00000000..47e17a63 --- /dev/null +++ b/moo/gtksourceview/Makefile.incl @@ -0,0 +1,32 @@ +moo_sources += \ + gtksourceview/gtksourcecontextengine.c \ + gtksourceview/gtksourcecontextengine.h \ + gtksourceview/gtksourceengine.c \ + gtksourceview/gtksourceengine.h \ + gtksourceview/gtksourceiter.c \ + gtksourceview/gtksourceiter.h \ + gtksourceview/gtksourcelanguage-parser-1.c \ + gtksourceview/gtksourcelanguage-parser-2.c \ + gtksourceview/gtksourcelanguage-private.h \ + gtksourceview/gtksourcelanguage.c \ + gtksourceview/gtksourcelanguage.h \ + gtksourceview/gtksourcelanguagemanager.c \ + gtksourceview/gtksourcelanguagemanager.h \ + gtksourceview/gtksourcestyle-private.h \ + gtksourceview/gtksourcestyle.c \ + gtksourceview/gtksourcestyle.h \ + gtksourceview/gtksourcestylescheme.c \ + gtksourceview/gtksourcestylescheme.h \ + gtksourceview/gtksourcestyleschememanager.c \ + gtksourceview/gtksourcestyleschememanager.h \ + gtksourceview/gtksourceview-utils.c \ + gtksourceview/gtksourceview-utils.h \ + gtksourceview/gtktextregion.c \ + gtksourceview/gtktextregion.h \ + gtksourceview/gtksourceview-i18n.h \ + gtksourceview/gtksourceview-marshal.h \ + gtksourceview/gtksourceview-api.h \ + gtksourceview/gtksourcebuffer.h \ + gtksourceview/gtksourceview.h + +# -%- strip:true -%- diff --git a/moo/medit/Makefile.am b/moo/medit-app/Makefile.incl similarity index 65% rename from moo/medit/Makefile.am rename to moo/medit-app/Makefile.incl index 095eed86..75a1e2bf 100644 --- a/moo/medit/Makefile.am +++ b/moo/medit-app/Makefile.incl @@ -1,40 +1,40 @@ bin_PROGRAMS = medit -AM_CPPFLAGS = $(MOO_CPPFLAGS) -I$(top_srcdir) -I$(top_srcdir)/moo -I$(top_srcdir)/doc -AM_CFLAGS = $(MOO_CFLAGS) -AM_CXXFLAGS = $(MOO_CXXFLAGS) - # if MOO_ENABLE_UNIT_TESTS # AM_CFLAGS += -DSRCDIR="${CMAKE_SOURCE_DIR}/medit") # endif -medit_SOURCES = \ - mem-debug.h \ - run-tests.h \ - parse.h \ - main.c +medit_SOURCES = \ + medit-app/mem-debug.h \ + medit-app/run-tests.h \ + medit-app/parse.h \ + medit-app/main.c \ + $(moo_sources) \ + $(plugins_sources) -nodist_EXTRA_medit_SOURCES = \ +nodist_EXTRA_medit_SOURCES = \ dummy.cpp -medit_LDADD = \ - ../plugins/libmooeditplugins.la \ - ../mooapp/libmooapp.la \ - ../eggsmclient/libeggsmclient.la \ - ../mooedit/libmooedit.la \ - ../gtksourceview/libgtksourceview.la \ - ../moofileview/libmoofileview.la \ - ../moolua/libmoolua.la \ - ../mooutils/libmooutils.la \ - ../xdgmime/libxdgmime.la \ - $(MOO_LIBS) +medit_LDADD = $(MOO_LIBS) $(moo_libadd) + +nodist_medit_SOURCES = \ + $(built_moo_sources) \ + $(built_plugins_sources) + +BUILT_SOURCES += \ + $(built_moo_sources) \ + $(built_plugins_sources) + +CLEANFILES += \ + $(built_moo_sources) \ + $(built_plugins_sources) medit_LDFLAGS = if MOO_OS_WIN32 medit_LDFLAGS += -mwindows endif -EXTRA_DIST = medit.desktop.in +EXTRA_DIST += medit-app/medit.desktop.in # desktopdir = $(datadir)/applications # desktop_DATA = medit.desktop.in diff --git a/moo/medit/Makefile.ug b/moo/medit-app/Makefile.ug similarity index 80% rename from moo/medit/Makefile.ug rename to moo/medit-app/Makefile.ug index 5ff1eb2c..fb4e9da3 100644 --- a/moo/medit/Makefile.ug +++ b/moo/medit-app/Makefile.ug @@ -15,20 +15,6 @@ nodist_medit_SOURCES = medit_SOURCES += main.c -# if MOO_USE_CPP -# real_main_c = cpp-main.cpp -# main.lo: cpp-main.lo ; @true -# cpp-main.cpp: main.c -# echo "#line 1 \"$(srcdir)/main.c\"" > cpp-main.cpp.tmp && \ -# cat $(srcdir)/main.c >> cpp-main.cpp.tmp && \ -# mv cpp-main.cpp.tmp cpp-main.cpp -# nodist_medit_SOURCES += cpp-main.cpp -# BUILT_SOURCES += cpp-main.cpp -# CLEANFILES += cpp-main.cpp -# else -# medit_SOURCES += main.c -# endif - if MOO_OS_WIN32 medit_LDFLAGS += -mwindows endif @@ -80,5 +66,3 @@ EXTRA_DIST += \ data/testustring.lua \ data/testunicode.lua \ data/lua/munit.lua - -parse.lo: main.o diff --git a/moo/medit/data/encodings/ASCII.1 b/moo/medit-app/data/encodings/ASCII.1 similarity index 100% rename from moo/medit/data/encodings/ASCII.1 rename to moo/medit-app/data/encodings/ASCII.1 diff --git a/moo/medit/data/encodings/ASCII.2 b/moo/medit-app/data/encodings/ASCII.2 similarity index 100% rename from moo/medit/data/encodings/ASCII.2 rename to moo/medit-app/data/encodings/ASCII.2 diff --git a/moo/medit/data/encodings/GB2312 b/moo/medit-app/data/encodings/GB2312 similarity index 100% rename from moo/medit/data/encodings/GB2312 rename to moo/medit-app/data/encodings/GB2312 diff --git a/moo/medit/data/encodings/KOI8-R.1 b/moo/medit-app/data/encodings/KOI8-R.1 similarity index 100% rename from moo/medit/data/encodings/KOI8-R.1 rename to moo/medit-app/data/encodings/KOI8-R.1 diff --git a/moo/medit/data/encodings/UCS-4.1 b/moo/medit-app/data/encodings/UCS-4.1 similarity index 100% rename from moo/medit/data/encodings/UCS-4.1 rename to moo/medit-app/data/encodings/UCS-4.1 diff --git a/moo/medit/data/encodings/UCS-4.2 b/moo/medit-app/data/encodings/UCS-4.2 similarity index 100% rename from moo/medit/data/encodings/UCS-4.2 rename to moo/medit-app/data/encodings/UCS-4.2 diff --git a/moo/medit/data/encodings/UCS-4.3 b/moo/medit-app/data/encodings/UCS-4.3 similarity index 100% rename from moo/medit/data/encodings/UCS-4.3 rename to moo/medit-app/data/encodings/UCS-4.3 diff --git a/moo/medit/data/encodings/UCS-4.4 b/moo/medit-app/data/encodings/UCS-4.4 similarity index 100% rename from moo/medit/data/encodings/UCS-4.4 rename to moo/medit-app/data/encodings/UCS-4.4 diff --git a/moo/medit/data/encodings/UTF-16.1 b/moo/medit-app/data/encodings/UTF-16.1 similarity index 100% rename from moo/medit/data/encodings/UTF-16.1 rename to moo/medit-app/data/encodings/UTF-16.1 diff --git a/moo/medit/data/encodings/UTF-16.2 b/moo/medit-app/data/encodings/UTF-16.2 similarity index 100% rename from moo/medit/data/encodings/UTF-16.2 rename to moo/medit-app/data/encodings/UTF-16.2 diff --git a/moo/medit/data/encodings/UTF-16.3 b/moo/medit-app/data/encodings/UTF-16.3 similarity index 100% rename from moo/medit/data/encodings/UTF-16.3 rename to moo/medit-app/data/encodings/UTF-16.3 diff --git a/moo/medit/data/encodings/UTF-16.4 b/moo/medit-app/data/encodings/UTF-16.4 similarity index 100% rename from moo/medit/data/encodings/UTF-16.4 rename to moo/medit-app/data/encodings/UTF-16.4 diff --git a/moo/medit/data/encodings/UTF-8.1 b/moo/medit-app/data/encodings/UTF-8.1 similarity index 100% rename from moo/medit/data/encodings/UTF-8.1 rename to moo/medit-app/data/encodings/UTF-8.1 diff --git a/moo/medit/data/encodings/UTF-8.2 b/moo/medit-app/data/encodings/UTF-8.2 similarity index 100% rename from moo/medit/data/encodings/UTF-8.2 rename to moo/medit-app/data/encodings/UTF-8.2 diff --git a/moo/medit/data/encodings/UTF-8.3 b/moo/medit-app/data/encodings/UTF-8.3 similarity index 100% rename from moo/medit/data/encodings/UTF-8.3 rename to moo/medit-app/data/encodings/UTF-8.3 diff --git a/moo/medit/data/encodings/UTF-8.4 b/moo/medit-app/data/encodings/UTF-8.4 similarity index 100% rename from moo/medit/data/encodings/UTF-8.4 rename to moo/medit-app/data/encodings/UTF-8.4 diff --git a/moo/medit/data/encodings/UTF-8.5 b/moo/medit-app/data/encodings/UTF-8.5 similarity index 100% rename from moo/medit/data/encodings/UTF-8.5 rename to moo/medit-app/data/encodings/UTF-8.5 diff --git a/moo/medit/data/encodings/Windows-1251.1 b/moo/medit-app/data/encodings/Windows-1251.1 similarity index 100% rename from moo/medit/data/encodings/Windows-1251.1 rename to moo/medit-app/data/encodings/Windows-1251.1 diff --git a/moo/medit/data/gobject.lua b/moo/medit-app/data/gobject.lua similarity index 100% rename from moo/medit/data/gobject.lua rename to moo/medit-app/data/gobject.lua diff --git a/moo/medit/data/lua/munit.lua b/moo/medit-app/data/lua/munit.lua similarity index 100% rename from moo/medit/data/lua/munit.lua rename to moo/medit-app/data/lua/munit.lua diff --git a/moo/medit/data/mooedit.lua b/moo/medit-app/data/mooedit.lua similarity index 100% rename from moo/medit/data/mooedit.lua rename to moo/medit-app/data/mooedit.lua diff --git a/moo/medit/data/testunicode.lua b/moo/medit-app/data/testunicode.lua similarity index 100% rename from moo/medit/data/testunicode.lua rename to moo/medit-app/data/testunicode.lua diff --git a/moo/medit/data/testustring.lua b/moo/medit-app/data/testustring.lua similarity index 100% rename from moo/medit/data/testustring.lua rename to moo/medit-app/data/testustring.lua diff --git a/moo/medit/data/textview.lua b/moo/medit-app/data/textview.lua similarity index 100% rename from moo/medit/data/textview.lua rename to moo/medit-app/data/textview.lua diff --git a/moo/medit/main.c b/moo/medit-app/main.c similarity index 100% rename from moo/medit/main.c rename to moo/medit-app/main.c diff --git a/moo/medit/medit-project.desktop.in b/moo/medit-app/medit-project.desktop.in similarity index 100% rename from moo/medit/medit-project.desktop.in rename to moo/medit-app/medit-project.desktop.in diff --git a/moo/medit/medit.desktop.in b/moo/medit-app/medit.desktop.in similarity index 100% rename from moo/medit/medit.desktop.in rename to moo/medit-app/medit.desktop.in diff --git a/moo/medit/medit.rc.in b/moo/medit-app/medit.rc.in similarity index 100% rename from moo/medit/medit.rc.in rename to moo/medit-app/medit.rc.in diff --git a/moo/medit/mem-debug.h b/moo/medit-app/mem-debug.h similarity index 100% rename from moo/medit/mem-debug.h rename to moo/medit-app/mem-debug.h diff --git a/moo/medit/parse.h b/moo/medit-app/parse.h similarity index 100% rename from moo/medit/parse.h rename to moo/medit-app/parse.h diff --git a/moo/medit/run-tests.h b/moo/medit-app/run-tests.h similarity index 97% rename from moo/medit/run-tests.h rename to moo/medit-app/run-tests.h index 63ba27b8..88d06ef0 100644 --- a/moo/medit/run-tests.h +++ b/moo/medit-app/run-tests.h @@ -46,7 +46,8 @@ unit_tests_main (int argc, char *argv[]) g_thread_init (NULL); g_set_prgname ("run-tests"); - data_dir = SRCDIR "/data"; +// data_dir = SRCDIR "/data"; + data_dir = NULL; grp = g_option_group_new ("run-tests", "run-tests", "run-tests", NULL, NULL); g_option_group_add_entries (grp, options); diff --git a/moo/medit/run-tests.sh b/moo/medit-app/run-tests.sh similarity index 100% rename from moo/medit/run-tests.sh rename to moo/medit-app/run-tests.sh diff --git a/moo/mooapp/Makefile.am b/moo/mooapp/Makefile.am deleted file mode 100644 index 5bdbad9b..00000000 --- a/moo/mooapp/Makefile.am +++ /dev/null @@ -1,42 +0,0 @@ -noinst_LTLIBRARIES = libmooapp.la - -EXTRA_DIST = -BUILT_SOURCES = -CLEANFILES = - -AM_CPPFLAGS = $(MOO_CPPFLAGS) -I.. -I$(top_srcdir)/doc -AM_CFLAGS = $(MOO_CFLAGS) -AM_CXXFLAGS = $(MOO_CXXFLAGS) - -libmooapp_la_SOURCES = \ - mooappabout.c \ - mooappabout.h \ - mooapp.c \ - mooapp.h \ - mooapp-accels.h \ - mooapp-info.h \ - mooapp-private.h\ - moohtml.h \ - moohtml.c \ - moolinklabel.h \ - moolinklabel.c - -EXTRA_DIST += \ - glade/mooappabout-dialog.glade \ - glade/mooappabout-license.glade \ - glade/mooappabout-credits.glade -BUILT_SOURCES += \ - glade/mooappabout-dialog-gxml.h \ - glade/mooappabout-license-gxml.h \ - glade/mooappabout-credits-gxml.h -CLEANFILES += \ - glade/mooappabout-dialog-gxml.h \ - glade/mooappabout-license-gxml.h \ - glade/mooappabout-credits-gxml.h - -BUILT_SOURCES += mooapp-credits.h -CLEANFILES += mooapp-credits.h -mooapp-credits.h: $(top_srcdir)/THANKS $(top_srcdir)/tools/xml2h.py - $(PYTHON) $(top_srcdir)/tools/xml2h.py $(top_srcdir)/THANKS mooapp-credits.h MOO_APP_CREDITS - -include ../../tools/rules.mk diff --git a/moo/mooapp/Makefile.incl b/moo/mooapp/Makefile.incl new file mode 100644 index 00000000..4e618417 --- /dev/null +++ b/moo/mooapp/Makefile.incl @@ -0,0 +1,26 @@ +moo_sources += \ + mooapp/mooappabout.c \ + mooapp/mooappabout.h \ + mooapp/mooapp.c \ + mooapp/mooapp.h \ + mooapp/mooapp-accels.h \ + mooapp/mooapp-info.h \ + mooapp/mooapp-private.h \ + mooapp/moohtml.h \ + mooapp/moohtml.c \ + mooapp/moolinklabel.h \ + mooapp/moolinklabel.c + +EXTRA_DIST += \ + mooapp/glade/mooappabout-dialog.glade \ + mooapp/glade/mooappabout-license.glade \ + mooapp/glade/mooappabout-credits.glade + +built_moo_sources += \ + mooappabout-dialog-gxml.h \ + mooappabout-license-gxml.h \ + mooappabout-credits-gxml.h + +built_moo_sources += mooapp-credits.h +mooapp-credits.h: $(top_srcdir)/THANKS $(top_srcdir)/tools/xml2h.py + $(PYTHON) $(top_srcdir)/tools/xml2h.py $(top_srcdir)/THANKS mooapp-credits.h MOO_APP_CREDITS diff --git a/moo/mooapp/mooappabout.c b/moo/mooapp/mooappabout.c index 124b976e..18d7f45d 100644 --- a/moo/mooapp/mooappabout.c +++ b/moo/mooapp/mooappabout.c @@ -26,9 +26,9 @@ #include "mooutils/moodialogs.h" #include "mooutils/moohelp.h" #include "help-sections.h" -#include "glade/mooappabout-dialog-gxml.h" -#include "glade/mooappabout-license-gxml.h" -#include "glade/mooappabout-credits-gxml.h" +#include "mooappabout-dialog-gxml.h" +#include "mooappabout-license-gxml.h" +#include "mooappabout-credits-gxml.h" #include #include #include diff --git a/moo/mooedit/Makefile.am b/moo/mooedit/Makefile.am deleted file mode 100644 index 069f7ef7..00000000 --- a/moo/mooedit/Makefile.am +++ /dev/null @@ -1,156 +0,0 @@ -noinst_LTLIBRARIES = libmooedit.la -EXTRA_DIST = -BUILT_SOURCES = -CLEANFILES = - -AM_CPPFLAGS = $(MOO_CPPFLAGS) -I.. -I$(top_srcdir)/doc -AM_CFLAGS = $(MOO_CFLAGS) -AM_CXXFLAGS = $(MOO_CXXFLAGS) - -libmooedit_la_SOURCES = \ - moocompletionsimple.c \ - moocompletionsimple.h \ - mootextcompletion.c \ - mootextcompletion.h \ - mootextpopup.c \ - mootextpopup.h \ - moocmdview.c \ - moocmdview.h \ - mooedit-accels.h \ - mooeditaction.c \ - mooeditaction-factory.c \ - mooeditaction-factory.h \ - mooeditaction.h \ - mooedit-bookmarks.c \ - mooedit-bookmarks.h \ - mooedit.c \ - mooedit.h \ - mooeditconfig.c \ - mooeditconfig.h \ - mooeditdialogs.c \ - mooeditdialogs.h \ - mooedit-fileops.c \ - mooedit-fileops.h \ - mooeditfiltersettings.c \ - mooeditfiltersettings.h \ - mooedit-impl.h \ - mooeditor.c \ - mooeditor.h \ - mooeditor-private.h \ - mooeditprefs.c \ - mooeditprefs.h \ - mooeditprefspage.c \ - mooedit-private.h \ - mooedit-tests.h \ - mooeditwindow.c \ - mooeditwindow.h \ - moofold.c \ - moofold.h \ - mooindenter.c \ - mooindenter.h \ - moolang.c \ - moolang.h \ - moolangmgr.c \ - moolangmgr.h \ - moolangmgr-private.h \ - moolang-private.h \ - moolinebuffer.c \ - moolinebuffer.h \ - moolinemark.c \ - moolinemark.h \ - moolineview.c \ - moolineview.h \ - moooutputfilter.c \ - moooutputfilter.h \ - mooplugin.c \ - mooplugin.h \ - mooplugin-loader.c \ - mooplugin-loader.h \ - mooplugin-macro.h \ - mootextbox.c \ - mootextbox.h \ - mootextbtree.c \ - mootextbtree.h \ - mootextbuffer.c \ - mootextbuffer.h \ - mootextfind.c \ - mootextfind.h \ - mootextiter.h \ - mootext-private.h \ - mootextsearch.c \ - mootextsearch.h \ - mootextsearch-private.h \ - mootextstylescheme.c \ - mootextstylescheme.h \ - mootextview.c \ - mootextview.h \ - mootextview-input.c \ - mootextview-private.h \ - mooprintpreview.h \ - mooprintpreview.c \ - mootextprint.c \ - mootextprint-private.h \ - mootextprint.h \ - mooedit-enums.c \ - mooedit-enums.h - -EXTRA_DIST += \ - glade/mooprintpreview.glade \ - glade/moopluginprefs.glade \ - glade/mooeditprefs-view.glade \ - glade/mooeditprefs-file.glade \ - glade/mooeditprefs-filters.glade \ - glade/mooeditprefs-general.glade \ - glade/mooeditprefs-langs.glade \ - glade/mooeditprogress.glade \ - glade/mooeditsavemult.glade \ - glade/mooprint.glade \ - glade/mootextfind.glade \ - glade/mootextfind-prompt.glade \ - glade/mootextgotoline.glade \ - glade/mooquicksearch.glade \ - glade/moostatusbar.glade - -BUILT_SOURCES += \ - glade/mooprintpreview-gxml.h \ - glade/moopluginprefs-gxml.h \ - glade/mooeditprefs-view-gxml.h \ - glade/mooeditprefs-file-gxml.h \ - glade/mooeditprefs-filters-gxml.h \ - glade/mooeditprefs-general-gxml.h \ - glade/mooeditprefs-langs-gxml.h \ - glade/mooeditprogress-gxml.h \ - glade/mooeditsavemult-gxml.h \ - glade/mooprint-gxml.h \ - glade/mootextfind-gxml.h \ - glade/mootextfind-prompt-gxml.h \ - glade/mootextgotoline-gxml.h \ - glade/mooquicksearch-gxml.h \ - glade/moostatusbar-gxml.h - -CLEANFILES += \ - glade/mooprintpreview-gxml.h \ - glade/moopluginprefs-gxml.h \ - glade/mooeditprefs-view-gxml.h \ - glade/mooeditprefs-file-gxml.h \ - glade/mooeditprefs-filters-gxml.h \ - glade/mooeditprefs-general-gxml.h \ - glade/mooeditprefs-langs-gxml.h \ - glade/mooeditprogress-gxml.h \ - glade/mooeditsavemult-gxml.h \ - glade/mooprint-gxml.h \ - glade/mootextfind-gxml.h \ - glade/mootextfind-prompt-gxml.h \ - glade/mootextgotoline-gxml.h \ - glade/mooquicksearch-gxml.h \ - glade/moostatusbar-gxml.h - -EXTRA_DIST += medit.xml mooedit.xml -BUILT_SOURCES += medit-ui.h mooedit-ui.h -CLEANFILES += medit-ui.h mooedit-ui.h - -include langs/Makefile.incl - -include ../../tools/rules.mk - -# -%- strip:true -%- diff --git a/moo/mooedit/Makefile.incl b/moo/mooedit/Makefile.incl new file mode 100644 index 00000000..59ed0743 --- /dev/null +++ b/moo/mooedit/Makefile.incl @@ -0,0 +1,127 @@ +moo_sources += \ + mooedit/moocompletionsimple.c \ + mooedit/moocompletionsimple.h \ + mooedit/mootextcompletion.c \ + mooedit/mootextcompletion.h \ + mooedit/mootextpopup.c \ + mooedit/mootextpopup.h \ + mooedit/moocmdview.c \ + mooedit/moocmdview.h \ + mooedit/mooedit-accels.h \ + mooedit/mooeditaction.c \ + mooedit/mooeditaction-factory.c \ + mooedit/mooeditaction-factory.h \ + mooedit/mooeditaction.h \ + mooedit/mooedit-bookmarks.c \ + mooedit/mooedit-bookmarks.h \ + mooedit/mooedit.c \ + mooedit/mooedit.h \ + mooedit/mooeditconfig.c \ + mooedit/mooeditconfig.h \ + mooedit/mooeditdialogs.c \ + mooedit/mooeditdialogs.h \ + mooedit/mooedit-fileops.c \ + mooedit/mooedit-fileops.h \ + mooedit/mooeditfiltersettings.c \ + mooedit/mooeditfiltersettings.h \ + mooedit/mooedit-impl.h \ + mooedit/mooeditor.c \ + mooedit/mooeditor.h \ + mooedit/mooeditor-private.h \ + mooedit/mooeditprefs.c \ + mooedit/mooeditprefs.h \ + mooedit/mooeditprefspage.c \ + mooedit/mooedit-private.h \ + mooedit/mooedit-tests.h \ + mooedit/mooeditwindow.c \ + mooedit/mooeditwindow.h \ + mooedit/moofold.c \ + mooedit/moofold.h \ + mooedit/mooindenter.c \ + mooedit/mooindenter.h \ + mooedit/moolang.c \ + mooedit/moolang.h \ + mooedit/moolangmgr.c \ + mooedit/moolangmgr.h \ + mooedit/moolangmgr-private.h \ + mooedit/moolang-private.h \ + mooedit/moolinebuffer.c \ + mooedit/moolinebuffer.h \ + mooedit/moolinemark.c \ + mooedit/moolinemark.h \ + mooedit/moolineview.c \ + mooedit/moolineview.h \ + mooedit/moooutputfilter.c \ + mooedit/moooutputfilter.h \ + mooedit/mooplugin.c \ + mooedit/mooplugin.h \ + mooedit/mooplugin-loader.c \ + mooedit/mooplugin-loader.h \ + mooedit/mooplugin-macro.h \ + mooedit/mootextbox.c \ + mooedit/mootextbox.h \ + mooedit/mootextbtree.c \ + mooedit/mootextbtree.h \ + mooedit/mootextbuffer.c \ + mooedit/mootextbuffer.h \ + mooedit/mootextfind.c \ + mooedit/mootextfind.h \ + mooedit/mootextiter.h \ + mooedit/mootext-private.h \ + mooedit/mootextsearch.c \ + mooedit/mootextsearch.h \ + mooedit/mootextsearch-private.h \ + mooedit/mootextstylescheme.c \ + mooedit/mootextstylescheme.h \ + mooedit/mootextview.c \ + mooedit/mootextview.h \ + mooedit/mootextview-input.c \ + mooedit/mootextview-private.h \ + mooedit/mooprintpreview.h \ + mooedit/mooprintpreview.c \ + mooedit/mootextprint.c \ + mooedit/mootextprint-private.h \ + mooedit/mootextprint.h \ + mooedit/mooedit-enums.c \ + mooedit/mooedit-enums.h + +EXTRA_DIST += \ + mooedit/glade/mooprintpreview.glade \ + mooedit/glade/moopluginprefs.glade \ + mooedit/glade/mooeditprefs-view.glade \ + mooedit/glade/mooeditprefs-file.glade \ + mooedit/glade/mooeditprefs-filters.glade \ + mooedit/glade/mooeditprefs-general.glade \ + mooedit/glade/mooeditprefs-langs.glade \ + mooedit/glade/mooeditprogress.glade \ + mooedit/glade/mooeditsavemult.glade \ + mooedit/glade/mooprint.glade \ + mooedit/glade/mootextfind.glade \ + mooedit/glade/mootextfind-prompt.glade \ + mooedit/glade/mootextgotoline.glade \ + mooedit/glade/mooquicksearch.glade \ + mooedit/glade/moostatusbar.glade + +built_moo_sources += \ + mooprintpreview-gxml.h \ + moopluginprefs-gxml.h \ + mooeditprefs-view-gxml.h \ + mooeditprefs-file-gxml.h \ + mooeditprefs-filters-gxml.h \ + mooeditprefs-general-gxml.h \ + mooeditprefs-langs-gxml.h \ + mooeditprogress-gxml.h \ + mooeditsavemult-gxml.h \ + mooprint-gxml.h \ + mootextfind-gxml.h \ + mootextfind-prompt-gxml.h \ + mootextgotoline-gxml.h \ + mooquicksearch-gxml.h \ + moostatusbar-gxml.h + +EXTRA_DIST += mooedit/medit.xml mooedit/mooedit.xml +built_moo_sources += medit-ui.h mooedit-ui.h + +include mooedit/langs/Makefile.incl + +# -%- strip:true -%- diff --git a/moo/mooedit/langs/Makefile.incl b/moo/mooedit/langs/Makefile.incl index 8be0e80f..33033599 100644 --- a/moo/mooedit/langs/Makefile.incl +++ b/moo/mooedit/langs/Makefile.incl @@ -1,84 +1,84 @@ langsdir = $(MOO_TEXT_LANG_FILES_DIR) -langs_DATA = \ - langs/ada.lang \ - langs/asp.lang \ - langs/awk.lang \ - langs/boo.lang \ - langs/changelog.lang \ - langs/chdr.lang \ - langs/c.lang \ - langs/cmake.lang \ - langs/cpp.lang \ - langs/csharp.lang \ - langs/css.lang \ - langs/def.lang \ - langs/desktop.lang \ - langs/diff.lang \ - langs/d.lang \ - langs/docbook.lang \ - langs/dosbatch.lang \ - langs/dot.lang \ - langs/dpatch.lang \ - langs/dtd.lang \ - langs/eiffel.lang \ - langs/erlang.lang \ - langs/forth.lang \ - langs/fortran.lang \ - langs/gap.lang \ - langs/gtk-doc.lang \ - langs/gtkrc.lang \ - langs/haddock.lang \ - langs/haskell.lang \ - langs/haskell-literate.lang \ - langs/html.lang \ - langs/idl.lang \ - langs/ini.lang \ - langs/java.lang \ - langs/javascript.lang \ - langs/latex.lang \ - langs/libtool.lang \ - langs/lua.lang \ - langs/m4.lang \ - langs/makefile.lang \ - langs/nemerle.lang \ - langs/nsis.lang \ - langs/objc.lang \ - langs/ocaml.lang \ - langs/ocl.lang \ - langs/octave.lang \ - langs/pascal.lang \ - langs/perl.lang \ - langs/php.lang \ - langs/pkgconfig.lang \ - langs/po.lang \ - langs/prolog.lang \ - langs/python-console.lang \ - langs/python.lang \ - langs/R.lang \ - langs/rpmspec.lang \ - langs/ruby.lang \ - langs/scheme.lang \ - langs/sh.lang \ - langs/sql.lang \ - langs/t2t.lang \ - langs/tcl.lang \ - langs/texinfo.lang \ - langs/vala.lang \ - langs/vbnet.lang \ - langs/verilog.lang \ - langs/vhdl.lang \ - langs/xml.lang \ - langs/xslt.lang \ - langs/yacc.lang \ - langs/msil.lang \ - langs/kate.xml \ - langs/classic.xml \ - langs/cobalt.xml \ - langs/oblivion.xml \ - langs/tango.xml \ - langs/language2.rng \ - langs/check.sh +langs_DATA = \ + mooedit/langs/ada.lang \ + mooedit/langs/asp.lang \ + mooedit/langs/awk.lang \ + mooedit/langs/boo.lang \ + mooedit/langs/changelog.lang \ + mooedit/langs/chdr.lang \ + mooedit/langs/c.lang \ + mooedit/langs/cmake.lang \ + mooedit/langs/cpp.lang \ + mooedit/langs/csharp.lang \ + mooedit/langs/css.lang \ + mooedit/langs/def.lang \ + mooedit/langs/desktop.lang \ + mooedit/langs/diff.lang \ + mooedit/langs/d.lang \ + mooedit/langs/docbook.lang \ + mooedit/langs/dosbatch.lang \ + mooedit/langs/dot.lang \ + mooedit/langs/dpatch.lang \ + mooedit/langs/dtd.lang \ + mooedit/langs/eiffel.lang \ + mooedit/langs/erlang.lang \ + mooedit/langs/forth.lang \ + mooedit/langs/fortran.lang \ + mooedit/langs/gap.lang \ + mooedit/langs/gtk-doc.lang \ + mooedit/langs/gtkrc.lang \ + mooedit/langs/haddock.lang \ + mooedit/langs/haskell.lang \ + mooedit/langs/haskell-literate.lang \ + mooedit/langs/html.lang \ + mooedit/langs/idl.lang \ + mooedit/langs/ini.lang \ + mooedit/langs/java.lang \ + mooedit/langs/javascript.lang \ + mooedit/langs/latex.lang \ + mooedit/langs/libtool.lang \ + mooedit/langs/lua.lang \ + mooedit/langs/m4.lang \ + mooedit/langs/makefile.lang \ + mooedit/langs/nemerle.lang \ + mooedit/langs/nsis.lang \ + mooedit/langs/objc.lang \ + mooedit/langs/ocaml.lang \ + mooedit/langs/ocl.lang \ + mooedit/langs/octave.lang \ + mooedit/langs/pascal.lang \ + mooedit/langs/perl.lang \ + mooedit/langs/php.lang \ + mooedit/langs/pkgconfig.lang \ + mooedit/langs/po.lang \ + mooedit/langs/prolog.lang \ + mooedit/langs/python-console.lang \ + mooedit/langs/python.lang \ + mooedit/langs/R.lang \ + mooedit/langs/rpmspec.lang \ + mooedit/langs/ruby.lang \ + mooedit/langs/scheme.lang \ + mooedit/langs/sh.lang \ + mooedit/langs/sql.lang \ + mooedit/langs/t2t.lang \ + mooedit/langs/tcl.lang \ + mooedit/langs/texinfo.lang \ + mooedit/langs/vala.lang \ + mooedit/langs/vbnet.lang \ + mooedit/langs/verilog.lang \ + mooedit/langs/vhdl.lang \ + mooedit/langs/xml.lang \ + mooedit/langs/xslt.lang \ + mooedit/langs/yacc.lang \ + mooedit/langs/msil.lang \ + mooedit/langs/kate.xml \ + mooedit/langs/classic.xml \ + mooedit/langs/cobalt.xml \ + mooedit/langs/oblivion.xml \ + mooedit/langs/tango.xml \ + mooedit/langs/language2.rng \ + mooedit/langs/check.sh EXTRA_DIST += $(langs_DATA) diff --git a/moo/mooedit/mooedit.c b/moo/mooedit/mooedit.c index 1557ab9b..85bd8b7e 100644 --- a/moo/mooedit/mooedit.c +++ b/moo/mooedit/mooedit.c @@ -29,7 +29,7 @@ #include "mooutils/mooutils-misc.h" #include "mooutils/mootype-macros.h" #include "mooutils/mooatom.h" -#include "glade/mooeditprogress-gxml.h" +#include "mooeditprogress-gxml.h" #include #include diff --git a/moo/mooedit/mooeditdialogs.c b/moo/mooedit/mooeditdialogs.c index 95f601d0..59a59ede 100644 --- a/moo/mooedit/mooeditdialogs.c +++ b/moo/mooedit/mooeditdialogs.c @@ -22,8 +22,8 @@ #include "mooutils/moostock.h" #include "mooutils/mooi18n.h" #include "mooutils/mooencodings.h" -#include "glade/mootextfind-prompt-gxml.h" -#include "glade/mooeditsavemult-gxml.h" +#include "mootextfind-prompt-gxml.h" +#include "mooeditsavemult-gxml.h" #include #include #include diff --git a/moo/mooedit/mooeditprefspage.c b/moo/mooedit/mooeditprefspage.c index 6476ba73..027cfc6d 100644 --- a/moo/mooedit/mooeditprefspage.c +++ b/moo/mooedit/mooeditprefspage.c @@ -28,11 +28,11 @@ #include "mooutils/mooencodings.h" #include "mooutils/mooi18n.h" #include "mooutils/moohelp.h" -#include "glade/mooeditprefs-file-gxml.h" -#include "glade/mooeditprefs-filters-gxml.h" -#include "glade/mooeditprefs-general-gxml.h" -#include "glade/mooeditprefs-langs-gxml.h" -#include "glade/mooeditprefs-view-gxml.h" +#include "mooeditprefs-file-gxml.h" +#include "mooeditprefs-filters-gxml.h" +#include "mooeditprefs-general-gxml.h" +#include "mooeditprefs-langs-gxml.h" +#include "mooeditprefs-view-gxml.h" #include "help-sections.h" #include diff --git a/moo/mooedit/mooeditwindow.c b/moo/mooedit/mooeditwindow.c index 5cbafb39..9e46d431 100644 --- a/moo/mooedit/mooeditwindow.c +++ b/moo/mooedit/mooeditwindow.c @@ -42,7 +42,7 @@ #include "mooutils/moofiledialog.h" #include "mooutils/mooencodings.h" #include "mooutils/mooatom.h" -#include "glade/moostatusbar-gxml.h" +#include "moostatusbar-gxml.h" #include #include #include diff --git a/moo/mooedit/mooplugin.c b/moo/mooedit/mooplugin.c index 56047dab..e844d55e 100644 --- a/moo/mooedit/mooplugin.c +++ b/moo/mooedit/mooplugin.c @@ -19,7 +19,7 @@ #include "mooedit/mooplugin.h" #include "mooedit/mooplugin-loader.h" -#include "glade/moopluginprefs-gxml.h" +#include "moopluginprefs-gxml.h" #include "mooutils/mooprefsdialog.h" #include "mooutils/moostock.h" #include "mooutils/mooutils-misc.h" diff --git a/moo/mooedit/mooprintpreview.c b/moo/mooedit/mooprintpreview.c index 55a30a69..60202b6b 100644 --- a/moo/mooedit/mooprintpreview.c +++ b/moo/mooedit/mooprintpreview.c @@ -24,7 +24,7 @@ #include "mooutils/mooutils-misc.h" #include "mooutils/mooutils-debug.h" #include "mooutils/mooglade.h" -#include "glade/mooprintpreview-gxml.h" +#include "mooprintpreview-gxml.h" #include MOO_DEBUG_INIT(printing, TRUE) diff --git a/moo/mooedit/mootextfind.c b/moo/mooedit/mootextfind.c index 352cc6cd..3682bd3b 100644 --- a/moo/mooedit/mootextfind.c +++ b/moo/mooedit/mootextfind.c @@ -24,8 +24,8 @@ #include "mooutils/moodialogs.h" #include "mooutils/mooi18n.h" #include "mooutils/moohelp.h" -#include "glade/mootextfind-gxml.h" -#include "glade/mootextgotoline-gxml.h" +#include "mootextfind-gxml.h" +#include "mootextgotoline-gxml.h" #include "help-sections.h" #include #include diff --git a/moo/mooedit/mootextprint.c b/moo/mooedit/mootextprint.c index a5423d59..d50f0304 100644 --- a/moo/mooedit/mootextprint.c +++ b/moo/mooedit/mootextprint.c @@ -25,7 +25,7 @@ #include "mooutils/mooutils-misc.h" #include "mooutils/mooutils-debug.h" #include "mooutils/mootype-macros.h" -#include "glade/mooprint-gxml.h" +#include "mooprint-gxml.h" #include #include #include diff --git a/moo/mooedit/mootextview.c b/moo/mooedit/mootextview.c index 1a51b24c..07b4b93a 100644 --- a/moo/mooedit/mootextview.c +++ b/moo/mooedit/mootextview.c @@ -32,7 +32,7 @@ #include "mooutils/mooi18n.h" #include "mooutils/mooatom.h" #include "mooutils/mootype-macros.h" -#include "glade/mooquicksearch-gxml.h" +#include "mooquicksearch-gxml.h" #include #include #include diff --git a/moo/moofileview/Makefile.am b/moo/moofileview/Makefile.am deleted file mode 100644 index 95a56331..00000000 --- a/moo/moofileview/Makefile.am +++ /dev/null @@ -1,68 +0,0 @@ -noinst_LTLIBRARIES = libmoofileview.la - -AM_CPPFLAGS = $(MOO_CPPFLAGS) -I.. -I$(top_srcdir)/doc -AM_CFLAGS = $(MOO_CFLAGS) -AM_CXXFLAGS = $(MOO_CXXFLAGS) - -BUILT_SOURCES = -EXTRA_DIST = -CLEANFILES = - -libmoofileview_la_SOURCES = \ - moobookmarkmgr.c \ - moobookmarkmgr.h \ - moobookmarkview.c \ - moobookmarkview.h \ - moofile.c \ - moofile.h \ - moofile-private.h \ - moofileentry.c \ - moofileentry.h \ - moofilesystem.c \ - moofilesystem.h \ - moofileview.c \ - moofileview.h \ - moofileview-accels.h \ - moofileview-aux.h \ - moofileview-dialogs.c \ - moofileview-dialogs.h \ - moofileview-impl.h \ - moofileview-private.h \ - moofileview-tools.c \ - moofileview-tools.h \ - moofolder-private.h \ - moofolder.c \ - moofolder.h \ - moofoldermodel.c \ - moofoldermodel.h \ - moofoldermodel-private.h\ - mooiconview.c \ - mooiconview.h \ - mootreeview.c \ - mootreeview.h - -EXTRA_DIST += \ - glade/moofileview-drop.glade \ - glade/moofileprops.glade \ - glade/moocreatefolder.glade \ - glade/moobookmark-editor.glade - -BUILT_SOURCES += \ - glade/moofileview-drop-gxml.h \ - glade/moofileprops-gxml.h \ - glade/moocreatefolder-gxml.h \ - glade/moobookmark-editor-gxml.h - -CLEANFILES += \ - glade/moofileview-drop-gxml.h \ - glade/moofileprops-gxml.h \ - glade/moocreatefolder-gxml.h \ - glade/moobookmark-editor-gxml.h - -EXTRA_DIST += moofileview.xml -BUILT_SOURCES += moofileview-ui.h -CLEANFILES += moofileview-ui.h - -include ../../tools/rules.mk - -# -%- strip:true -%- diff --git a/moo/moofileview/Makefile.incl b/moo/moofileview/Makefile.incl new file mode 100644 index 00000000..aa597897 --- /dev/null +++ b/moo/moofileview/Makefile.incl @@ -0,0 +1,51 @@ +AM_CPPFLAGS += -Imoofileview -Imoofileview/glade + +moo_sources += \ + moofileview/moobookmarkmgr.c \ + moofileview/moobookmarkmgr.h \ + moofileview/moobookmarkview.c \ + moofileview/moobookmarkview.h \ + moofileview/moofile.c \ + moofileview/moofile.h \ + moofileview/moofile-private.h \ + moofileview/moofileentry.c \ + moofileview/moofileentry.h \ + moofileview/moofilesystem.c \ + moofileview/moofilesystem.h \ + moofileview/moofileview.c \ + moofileview/moofileview.h \ + moofileview/moofileview-accels.h \ + moofileview/moofileview-aux.h \ + moofileview/moofileview-dialogs.c \ + moofileview/moofileview-dialogs.h \ + moofileview/moofileview-impl.h \ + moofileview/moofileview-private.h \ + moofileview/moofileview-tools.c \ + moofileview/moofileview-tools.h \ + moofileview/moofolder-private.h \ + moofileview/moofolder.c \ + moofileview/moofolder.h \ + moofileview/moofoldermodel.c \ + moofileview/moofoldermodel.h \ + moofileview/moofoldermodel-private.h \ + moofileview/mooiconview.c \ + moofileview/mooiconview.h \ + moofileview/mootreeview.c \ + moofileview/mootreeview.h + +EXTRA_DIST += \ + moofileview/glade/moofileview-drop.glade \ + moofileview/glade/moofileprops.glade \ + moofileview/glade/moocreatefolder.glade \ + moofileview/glade/moobookmark-editor.glade + +built_moo_sources += \ + moofileview-drop-gxml.h \ + moofileprops-gxml.h \ + moocreatefolder-gxml.h \ + moobookmark-editor-gxml.h + +EXTRA_DIST += moofileview/moofileview.xml +built_moo_sources += moofileview-ui.h + +# -%- strip:true -%- diff --git a/moo/moofileview/moobookmarkmgr.c b/moo/moofileview/moobookmarkmgr.c index e9e2e5f0..a6b09a34 100644 --- a/moo/moofileview/moobookmarkmgr.c +++ b/moo/moofileview/moobookmarkmgr.c @@ -26,7 +26,7 @@ #include "mooutils/mooutils-misc.h" #include "mooutils/moostock.h" #include "mooutils/mootype-macros.h" -#include "glade/moobookmark-editor-gxml.h" +#include "moobookmark-editor-gxml.h" #include #include #ifdef HAVE_UNISTD_H diff --git a/moo/moofileview/moofileview-dialogs.c b/moo/moofileview/moofileview-dialogs.c index 0f54ae41..6843e01a 100644 --- a/moo/moofileview/moofileview-dialogs.c +++ b/moo/moofileview/moofileview-dialogs.c @@ -21,9 +21,9 @@ #include "mooutils/mooutils-gobject.h" #include "mooutils/moodialogs.h" #include "mooutils/mooi18n.h" -#include "glade/moofileprops-gxml.h" -#include "glade/moocreatefolder-gxml.h" -#include "glade/moofileview-drop-gxml.h" +#include "moofileprops-gxml.h" +#include "moocreatefolder-gxml.h" +#include "moofileview-drop-gxml.h" #include #include #include diff --git a/moo/moolua/Makefile.am b/moo/moolua/Makefile.am deleted file mode 100644 index 33ca906a..00000000 --- a/moo/moolua/Makefile.am +++ /dev/null @@ -1,83 +0,0 @@ -noinst_LTLIBRARIES = libmoolua.la -libmoolua_la_LIBADD = - -AM_CPPFLAGS = $(MOO_CPPFLAGS) -DLUA_USE_APICHECK -AM_CFLAGS = $(MOO_CFLAGS) -AM_CXXFLAGS = $(MOO_CXXFLAGS) - -if MOO_OS_DARWIN -AM_CPPFLAGS += -DLUA_USE_MACOSX -else !MOO_OS_DARWIN -if MOO_OS_WIN32 -else !MOO_OS_WIN32 -AM_CPPFLAGS += -DLUA_USE_POSIX -DLUA_USE_DLOPEN -libmoolua_la_LIBADD += -ldl -endif !MOO_OS_WIN32 -endif !MOO_OS_DARWIN - -libmoolua_la_SOURCES = \ - ext/lfs.h \ - ext/lfs.cpp \ - moolua.h \ - moolua.cpp \ - moolua-tests.h \ - moo-tests-lua.h \ - luaall.cpp - -EXTRA_DIST = \ - COPYRIGHT \ - lapi.c \ - lapi.h \ - lauxlib.c \ - lauxlib.h \ - lbaselib.c \ - lcode.c \ - lcode.h \ - ldblib.c \ - ldebug.c \ - ldebug.h \ - ldo.c \ - ldo.h \ - ldump.c \ - lfunc.c \ - lfunc.h \ - lgc.c \ - lgc.h \ - linit.c \ - liolib.c \ - llex.c \ - llex.h \ - llimits.h \ - lmathlib.c \ - lmem.c \ - lmem.h \ - loadlib.c \ - lobject.c \ - lobject.h \ - lopcodes.c \ - lopcodes.h \ - loslib.c \ - lparser.c \ - lparser.h \ - lstate.c \ - lstate.h \ - lstring.c \ - lstring.h \ - ltable.c \ - ltable.h \ - ltablib.c \ - ltm.c \ - ltm.h \ - lua.h \ - luaall.cpp \ - luaconf.h \ - lualib.h \ - lundump.c \ - lundump.h \ - lvm.c \ - lvm.h \ - lzio.c \ - lzio.h \ - README \ - slnudata.c \ - slnunico.c diff --git a/moo/moolua/Makefile.incl b/moo/moolua/Makefile.incl new file mode 100644 index 00000000..1197f9f5 --- /dev/null +++ b/moo/moolua/Makefile.incl @@ -0,0 +1,78 @@ +AM_CPPFLAGS += -DLUA_USE_APICHECK -I$(moo_srcdir)/moolua + +if MOO_OS_DARWIN +AM_CPPFLAGS += -DLUA_USE_MACOSX +else !MOO_OS_DARWIN +if MOO_OS_WIN32 +else !MOO_OS_WIN32 +AM_CPPFLAGS += -DLUA_USE_POSIX -DLUA_USE_DLOPEN +moo_libadd += -ldl +endif !MOO_OS_WIN32 +endif !MOO_OS_DARWIN + +moo_sources += \ + moolua/ext/lfs.h \ + moolua/ext/lfs.cpp \ + moolua/moolua.h \ + moolua/moolua.cpp \ + moolua/moolua-tests.h \ + moolua/moo-tests-lua.h \ + moolua/luaall.cpp + +EXTRA_DIST += \ + moolua/COPYRIGHT \ + moolua/lapi.c \ + moolua/lapi.h \ + moolua/lauxlib.c \ + moolua/lauxlib.h \ + moolua/lbaselib.c \ + moolua/lcode.c \ + moolua/lcode.h \ + moolua/ldblib.c \ + moolua/ldebug.c \ + moolua/ldebug.h \ + moolua/ldo.c \ + moolua/ldo.h \ + moolua/ldump.c \ + moolua/lfunc.c \ + moolua/lfunc.h \ + moolua/lgc.c \ + moolua/lgc.h \ + moolua/linit.c \ + moolua/liolib.c \ + moolua/llex.c \ + moolua/llex.h \ + moolua/llimits.h \ + moolua/lmathlib.c \ + moolua/lmem.c \ + moolua/lmem.h \ + moolua/loadlib.c \ + moolua/lobject.c \ + moolua/lobject.h \ + moolua/lopcodes.c \ + moolua/lopcodes.h \ + moolua/loslib.c \ + moolua/lparser.c \ + moolua/lparser.h \ + moolua/lstate.c \ + moolua/lstate.h \ + moolua/lstring.c \ + moolua/lstring.h \ + moolua/ltable.c \ + moolua/ltable.h \ + moolua/ltablib.c \ + moolua/ltm.c \ + moolua/ltm.h \ + moolua/lua.h \ + moolua/luaall.cpp \ + moolua/luaconf.h \ + moolua/lualib.h \ + moolua/lundump.c \ + moolua/lundump.h \ + moolua/lvm.c \ + moolua/lvm.h \ + moolua/lzio.c \ + moolua/lzio.h \ + moolua/README \ + moolua/slnudata.c \ + moolua/slnunico.c diff --git a/moo/moolua/moo-tests-lua.h b/moo/moolua/moo-tests-lua.h index 1c9a489e..9f018f67 100644 --- a/moo/moolua/moo-tests-lua.h +++ b/moo/moolua/moo-tests-lua.h @@ -107,7 +107,7 @@ moo_test_run_lua_file (const char *basename, luaL_openlibs (L); { - char *testdir = g_build_filename (moo_test_get_data_dir (), "lua", NULL); + char *testdir = g_build_filename (moo_test_get_data_dir (), "lua", (char*) NULL); lua_addpath (L, (char**) &testdir, 1); g_free (testdir); } diff --git a/moo/mooutils/Makefile.am b/moo/mooutils/Makefile.am deleted file mode 100644 index 0f56a9c1..00000000 --- a/moo/mooutils/Makefile.am +++ /dev/null @@ -1,210 +0,0 @@ -noinst_LTLIBRARIES = libmooutils.la - -AM_CPPFLAGS = $(MOO_CPPFLAGS) -I.. -I$(top_srcdir)/doc -AM_CFLAGS = $(MOO_CFLAGS) -AM_CXXFLAGS = $(MOO_CXXFLAGS) - -BUILT_SOURCES = -CLEANFILES = - -libmooutils_la_SOURCES = \ - moocpp-types.h \ - moocpp.cpp \ - moocpp.h \ - moocpp-cont.h \ - moocpp-exc.h \ - moocpp-macros.h \ - moocpp-refptr.h \ - mooutils-thread.c \ - mooutils-thread.h \ - mdhistorymgr.c \ - mdhistorymgr.h \ - moo-environ.h \ - mooaccel.c \ - mooaccel.h \ - mooaccelbutton.c \ - mooaccelbutton.h \ - mooaccelprefs.c \ - mooaccelprefs.h \ - mooaction-private.h \ - mooaction.c \ - mooaction.h \ - mooactionbase-private.h \ - mooactionbase.c \ - mooactionbase.h \ - mooactioncollection.c \ - mooactioncollection.h \ - mooactionfactory.c \ - mooactionfactory.h \ - mooactiongroup.c \ - mooactiongroup.h \ - mooapp-ipc.c \ - mooapp-ipc.h \ - mooappinput.c \ - mooappinput.h \ - mooatom.h \ - moobigpaned.c \ - moobigpaned.h \ - mooclosure.c \ - mooclosure.h \ - moocombo.c \ - moocombo.h \ - moocompat.c \ - moocompat.h \ - moodialogs.c \ - moodialogs.h \ - mooeditops.c \ - mooeditops.h \ - mooencodings-data.h \ - mooencodings.c \ - mooencodings.h \ - mooentry.c \ - mooentry.h \ - moofiledialog.c \ - moofiledialog.h \ - moofileicon.c \ - moofileicon.h \ - moofilewatch.c \ - moofilewatch.h \ - moofiltermgr.c \ - moofiltermgr.h \ - moofontsel.c \ - moofontsel.h \ - mooglade.c \ - mooglade.h \ - moohelp.c \ - moohelp.h \ - moohistorycombo.c \ - moohistorycombo.h \ - moohistorylist.c \ - moohistorylist.h \ - mooi18n.c \ - mooi18n.h \ - moolist.h \ - moomarkup.c \ - moomarkup.h \ - moomenu.c \ - moomenu.h \ - moomenuaction.c \ - moomenuaction.h \ - moomenumgr.c \ - moomenumgr.h \ - moomenutoolbutton.c \ - moomenutoolbutton.h \ - moo-mime.c \ - moo-mime.h \ - moonotebook.c \ - moonotebook.h \ - mooonce.h \ - moopane.c \ - moopane.h \ - moopaned.c \ - moopaned.h \ - mooprefs.c \ - mooprefs.h \ - mooprefsdialog.c \ - mooprefsdialog.h \ - mooprefspage.c \ - mooprefspage.h \ - moopython.h \ - moospawn.c \ - moospawn.h \ - moostat.h \ - moostock.c \ - moostock.h \ - mootype-macros.h \ - moouixml.c \ - moouixml.h \ - mooundo.c \ - mooundo.h \ - mooutils-debug.h \ - mooutils-enums.c \ - mooutils-enums.h \ - mooutils-file.c \ - mooutils-file.h \ - mooutils-file-private.h \ - mooutils-fli.c \ - mooutils-fs.c \ - mooutils-fs.h \ - mooutils-gobject-private.h \ - mooutils-gobject.c \ - mooutils-gobject.h \ - mooutils-macros.h \ - mooutils-mem.h \ - mooutils-messages.h \ - mooutils-misc.c \ - mooutils-misc.h \ - mooutils-tests.h \ - mooutils-treeview.c \ - mooutils-treeview.h \ - moowindow.c \ - moowindow.h \ - stock-file-24.h \ - stock-file-selector-24.h\ - stock-select-all-16.h \ - stock-select-all-24.h \ - stock-terminal-24.h - -libmooutils_la_SOURCES += marshals.c -BUILT_SOURCES += marshals.c -CLEANFILES += marshals.c -marshals.c: $(srcdir)/../marshals.list - echo '#include "marshals.h"' > marshals.c.tmp - $(GLIB_GENMARSHAL) --prefix=_moo_marshal --body $(srcdir)/../marshals.list >> marshals.c.tmp \ - && mv marshals.c.tmp marshals.c - -if MOO_OS_WIN32 -libmooutils_la_SOURCES += mooutils-win32.c -endif -if MOO_ENABLE_UNIT_TESTS -libmooutils_la_SOURCES += \ - moo-test-utils.c \ - moo-test-utils.h \ - moo-test-macros.h -endif - -EXTRA_DIST = \ - glade/mooaccelprefs.glade \ - glade/mooaccelbutton.glade \ - glade/moologwindow.glade -BUILT_SOURCES += \ - glade/mooaccelprefs-gxml.h \ - glade/mooaccelbutton-gxml.h \ - glade/moologwindow-gxml.h -CLEANFILES += \ - glade/mooaccelprefs-gxml.h \ - glade/mooaccelbutton-gxml.h \ - glade/moologwindow-gxml.h - -BUILT_SOURCES += stock-moo.h moofileicon-symlink.h -CLEANFILES += stock-moo.h moofileicon-symlink.h -PIXMAPS = pixmaps/hide.png pixmaps/close.png pixmaps/sticky.png pixmaps/detach.png pixmaps/attach.png pixmaps/keepontop.png pixmaps/medit.png -EXTRA_DIST += $(PIXMAPS) -stock-moo.h: $(PIXMAPS) - $(GDK_PIXBUF_CSOURCE) --static --build-list \ - MOO_HIDE_ICON $(srcdir)/pixmaps/hide.png \ - MOO_CLOSE_ICON $(srcdir)/pixmaps/close.png \ - MOO_STICKY_ICON $(srcdir)/pixmaps/sticky.png \ - MOO_DETACH_ICON $(srcdir)/pixmaps/detach.png \ - MOO_ATTACH_ICON $(srcdir)/pixmaps/attach.png \ - MOO_KEEP_ON_TOP_ICON $(srcdir)/pixmaps/keepontop.png \ - MEDIT_ICON $(srcdir)/pixmaps/medit.png \ - > $@.tmp && mv $@.tmp $@ -EXTRA_DIST += pixmaps/symlink.png pixmaps/symlink-small.png -moofileicon-symlink.h: pixmaps/symlink.png pixmaps/symlink-small.png - $(GDK_PIXBUF_CSOURCE) --static --build-list \ - SYMLINK_ARROW $(srcdir)/pixmaps/symlink.png \ - SYMLINK_ARROW_SMALL $(srcdir)/pixmaps/symlink-small.png \ - > $@.tmp && mv $@.tmp $@ - -# SET(moo_utils_enum_headers -# moofiledialog.h -# moofilewatch.h -# mooprefs.h -# moouixml.h -# mooutils-misc.h -# ) - -include ../../tools/rules.mk - -# -%- strip:true -%- diff --git a/moo/mooutils/Makefile.incl b/moo/mooutils/Makefile.incl new file mode 100644 index 00000000..edf28a2a --- /dev/null +++ b/moo/mooutils/Makefile.incl @@ -0,0 +1,197 @@ +moo_sources += \ + mooutils/moocpp-types.h \ + mooutils/moocpp.cpp \ + mooutils/moocpp.h \ + mooutils/moocpp-cont.h \ + mooutils/moocpp-exc.h \ + mooutils/moocpp-macros.h \ + mooutils/moocpp-refptr.h \ + mooutils/mooutils-thread.c \ + mooutils/mooutils-thread.h \ + mooutils/mdhistorymgr.c \ + mooutils/mdhistorymgr.h \ + mooutils/moo-environ.h \ + mooutils/mooaccel.c \ + mooutils/mooaccel.h \ + mooutils/mooaccelbutton.c \ + mooutils/mooaccelbutton.h \ + mooutils/mooaccelprefs.c \ + mooutils/mooaccelprefs.h \ + mooutils/mooaction-private.h \ + mooutils/mooaction.c \ + mooutils/mooaction.h \ + mooutils/mooactionbase-private.h\ + mooutils/mooactionbase.c \ + mooutils/mooactionbase.h \ + mooutils/mooactioncollection.c \ + mooutils/mooactioncollection.h \ + mooutils/mooactionfactory.c \ + mooutils/mooactionfactory.h \ + mooutils/mooactiongroup.c \ + mooutils/mooactiongroup.h \ + mooutils/mooapp-ipc.c \ + mooutils/mooapp-ipc.h \ + mooutils/mooappinput.c \ + mooutils/mooappinput.h \ + mooutils/mooatom.h \ + mooutils/moobigpaned.c \ + mooutils/moobigpaned.h \ + mooutils/mooclosure.c \ + mooutils/mooclosure.h \ + mooutils/moocombo.c \ + mooutils/moocombo.h \ + mooutils/moocompat.c \ + mooutils/moocompat.h \ + mooutils/moodialogs.c \ + mooutils/moodialogs.h \ + mooutils/mooeditops.c \ + mooutils/mooeditops.h \ + mooutils/mooencodings-data.h \ + mooutils/mooencodings.c \ + mooutils/mooencodings.h \ + mooutils/mooentry.c \ + mooutils/mooentry.h \ + mooutils/moofiledialog.c \ + mooutils/moofiledialog.h \ + mooutils/moofileicon.c \ + mooutils/moofileicon.h \ + mooutils/moofilewatch.c \ + mooutils/moofilewatch.h \ + mooutils/moofiltermgr.c \ + mooutils/moofiltermgr.h \ + mooutils/moofontsel.c \ + mooutils/moofontsel.h \ + mooutils/mooglade.c \ + mooutils/mooglade.h \ + mooutils/moohelp.c \ + mooutils/moohelp.h \ + mooutils/moohistorycombo.c \ + mooutils/moohistorycombo.h \ + mooutils/moohistorylist.c \ + mooutils/moohistorylist.h \ + mooutils/mooi18n.c \ + mooutils/mooi18n.h \ + mooutils/moolist.h \ + mooutils/moomarkup.c \ + mooutils/moomarkup.h \ + mooutils/moomenu.c \ + mooutils/moomenu.h \ + mooutils/moomenuaction.c \ + mooutils/moomenuaction.h \ + mooutils/moomenumgr.c \ + mooutils/moomenumgr.h \ + mooutils/moomenutoolbutton.c \ + mooutils/moomenutoolbutton.h \ + mooutils/moo-mime.c \ + mooutils/moo-mime.h \ + mooutils/moonotebook.c \ + mooutils/moonotebook.h \ + mooutils/mooonce.h \ + mooutils/moopane.c \ + mooutils/moopane.h \ + mooutils/moopaned.c \ + mooutils/moopaned.h \ + mooutils/mooprefs.c \ + mooutils/mooprefs.h \ + mooutils/mooprefsdialog.c \ + mooutils/mooprefsdialog.h \ + mooutils/mooprefspage.c \ + mooutils/mooprefspage.h \ + mooutils/moopython.h \ + mooutils/moospawn.c \ + mooutils/moospawn.h \ + mooutils/moostat.h \ + mooutils/moostock.c \ + mooutils/moostock.h \ + mooutils/mootype-macros.h \ + mooutils/moouixml.c \ + mooutils/moouixml.h \ + mooutils/mooundo.c \ + mooutils/mooundo.h \ + mooutils/mooutils-debug.h \ + mooutils/mooutils-enums.c \ + mooutils/mooutils-enums.h \ + mooutils/mooutils-file.c \ + mooutils/mooutils-file.h \ + mooutils/mooutils-file-private.h\ + mooutils/mooutils-fli.c \ + mooutils/mooutils-fs.c \ + mooutils/mooutils-fs.h \ + mooutils/mooutils-gobject-private.h \ + mooutils/mooutils-gobject.c \ + mooutils/mooutils-gobject.h \ + mooutils/mooutils-macros.h \ + mooutils/mooutils-mem.h \ + mooutils/mooutils-messages.h \ + mooutils/mooutils-misc.c \ + mooutils/mooutils-misc.h \ + mooutils/mooutils-tests.h \ + mooutils/mooutils-treeview.c \ + mooutils/mooutils-treeview.h \ + mooutils/moowindow.c \ + mooutils/moowindow.h \ + mooutils/stock-file-24.h \ + mooutils/stock-file-selector-24.h\ + mooutils/stock-select-all-16.h \ + mooutils/stock-select-all-24.h \ + mooutils/stock-terminal-24.h + +built_moo_sources += marshals.c +marshals.c: $(moo_srcdir)/marshals.list + $(MKDIR_P) mooutils + echo '#include "marshals.h"' > marshals.c.tmp + $(GLIB_GENMARSHAL) --prefix=_moo_marshal --body $(moo_srcdir)/marshals.list >> marshals.c.tmp \ + && mv marshals.c.tmp marshals.c + +mooutils_win32_sources = mooutils/mooutils-win32.c +mooutils_unittest_sources = \ + mooutils/moo-test-utils.c \ + mooutils/moo-test-utils.h \ + mooutils/moo-test-macros.h +EXTRA_DIST += $(mooutils_win32_sources) $(mooutils_unittest_sources) + +if MOO_OS_WIN32 +moo_sources += $(mooutils_win32_sources) +endif +if MOO_ENABLE_UNIT_TESTS +moo_sources += $(mooutils_unittest_sources) +endif + +EXTRA_DIST += \ + mooutils/glade/mooaccelprefs.glade \ + mooutils/glade/mooaccelbutton.glade \ + mooutils/glade/moologwindow.glade +built_moo_sources += \ + mooaccelprefs-gxml.h \ + mooaccelbutton-gxml.h \ + moologwindow-gxml.h + +built_moo_sources += stock-moo.h moofileicon-symlink.h +PIXMAPS = \ + mooutils/pixmaps/hide.png \ + mooutils/pixmaps/close.png \ + mooutils/pixmaps/sticky.png \ + mooutils/pixmaps/detach.png \ + mooutils/pixmaps/attach.png \ + mooutils/pixmaps/keepontop.png \ + mooutils/pixmaps/medit.png +EXTRA_DIST += $(PIXMAPS) +stock-moo.h: $(PIXMAPS) + $(GDK_PIXBUF_CSOURCE) --static --build-list \ + MOO_HIDE_ICON $(moo_srcdir)/mooutils/pixmaps/hide.png \ + MOO_CLOSE_ICON $(moo_srcdir)/mooutils/pixmaps/close.png \ + MOO_STICKY_ICON $(moo_srcdir)/mooutils/pixmaps/sticky.png \ + MOO_DETACH_ICON $(moo_srcdir)/mooutils/pixmaps/detach.png \ + MOO_ATTACH_ICON $(moo_srcdir)/mooutils/pixmaps/attach.png \ + MOO_KEEP_ON_TOP_ICON $(moo_srcdir)/mooutils/pixmaps/keepontop.png \ + MEDIT_ICON $(moo_srcdir)/mooutils/pixmaps/medit.png \ + > $@.tmp && mv $@.tmp $@ + +EXTRA_DIST += mooutils/pixmaps/symlink.png mooutils/pixmaps/symlink-small.png +moofileicon-symlink.h: mooutils/pixmaps/symlink.png mooutils/pixmaps/symlink-small.png + $(GDK_PIXBUF_CSOURCE) --static --build-list \ + SYMLINK_ARROW $(moo_srcdir)/mooutils/pixmaps/symlink.png \ + SYMLINK_ARROW_SMALL $(moo_srcdir)/mooutils/pixmaps/symlink-small.png \ + > $@.tmp && mv $@.tmp $@ + +# -%- strip:true -%- diff --git a/moo/mooutils/mooaccelbutton.c b/moo/mooutils/mooaccelbutton.c index 4e5c1c2b..99b9c4ec 100644 --- a/moo/mooutils/mooaccelbutton.c +++ b/moo/mooutils/mooaccelbutton.c @@ -17,7 +17,7 @@ #include "marshals.h" #include "mooutils/moodialogs.h" #include "mooutils/mooi18n.h" -#include "glade/mooaccelbutton-gxml.h" +#include "mooaccelbutton-gxml.h" #include #include diff --git a/moo/mooutils/mooaccelprefs.c b/moo/mooutils/mooaccelprefs.c index 31bf259f..60203cd0 100644 --- a/moo/mooutils/mooaccelprefs.c +++ b/moo/mooutils/mooaccelprefs.c @@ -25,7 +25,7 @@ #include "mooutils/mooactiongroup.h" #include "mooutils/mootype-macros.h" #include "mooutils/moohelp.h" -#include "glade/mooaccelprefs-gxml.h" +#include "mooaccelprefs-gxml.h" #include "help-sections.h" #include #include diff --git a/moo/mooutils/mooutils-misc.c b/moo/mooutils/mooutils-misc.c index a1743292..0157824d 100644 --- a/moo/mooutils/mooutils-misc.c +++ b/moo/mooutils/mooutils-misc.c @@ -22,7 +22,7 @@ #include "mooutils/mooatom.h" #include "mooutils/mooonce.h" #include "mooutils/mooutils-misc.h" -#include "glade/moologwindow-gxml.h" +#include "moologwindow-gxml.h" #include #include #include diff --git a/moo/plugins/Makefile.am b/moo/plugins/Makefile.am deleted file mode 100644 index 117c4d8d..00000000 --- a/moo/plugins/Makefile.am +++ /dev/null @@ -1,44 +0,0 @@ -SUBDIRS = script usertools - -noinst_LTLIBRARIES = libmooeditplugins.la - -libmooeditplugins_la_LIBADD = script/libmomscript.la usertools/libmoousertools.la - -AM_CPPFLAGS = $(MOO_CPPFLAGS) -I$(top_srcdir)/moo -I$(top_srcdir)/doc -I.. -AM_CFLAGS = $(MOO_CFLAGS) -AM_CXXFLAGS = $(MOO_CXXFLAGS) - -EXTRA_DIST = -BUILT_SOURCES = -CLEANFILES = - -libmooeditplugins_la_SOURCES = \ - moofileselector-prefs.c \ - moofileselector.c \ - moofileselector.h \ - mooeditplugins.h \ - mooeditplugins.c \ - moofilelist.c \ - moofind.c - -EXTRA_DIST += \ - glade/moofileselector-prefs.glade \ - glade/moofileselector.glade \ - glade/moofind.glade \ - glade/moogrep.glade - -BUILT_SOURCES += \ - glade/moofileselector-prefs-gxml.h \ - glade/moofileselector-gxml.h \ - glade/moofind-gxml.h \ - glade/moogrep-gxml.h - -CLEANFILES += \ - glade/moofileselector-prefs-gxml.h \ - glade/moofileselector-gxml.h \ - glade/moofind-gxml.h \ - glade/moogrep-gxml.h - -include ctags/Makefile.incl - -include $(top_srcdir)/tools/rules.mk diff --git a/moo/plugins/Makefile.incl b/moo/plugins/Makefile.incl new file mode 100644 index 00000000..8082b9ae --- /dev/null +++ b/moo/plugins/Makefile.incl @@ -0,0 +1,26 @@ +AM_CPPFLAGS += -I$(srcdir)/plugins + +plugins_sources += \ + plugins/moofileselector-prefs.c \ + plugins/moofileselector.c \ + plugins/moofileselector.h \ + plugins/mooeditplugins.h \ + plugins/mooeditplugins.c \ + plugins/moofilelist.c \ + plugins/moofind.c + +EXTRA_DIST += \ + plugins/glade/moofileselector-prefs.glade \ + plugins/glade/moofileselector.glade \ + plugins/glade/moofind.glade \ + plugins/glade/moogrep.glade + +built_plugins_sources += \ + moofileselector-prefs-gxml.h \ + moofileselector-gxml.h \ + moofind-gxml.h \ + moogrep-gxml.h + +include plugins/ctags/Makefile.incl +include plugins/script/Makefile.incl +include plugins/usertools/Makefile.incl diff --git a/moo/plugins/ctags/Makefile.incl b/moo/plugins/ctags/Makefile.incl index 71b66f3c..d69cf32e 100644 --- a/moo/plugins/ctags/Makefile.incl +++ b/moo/plugins/ctags/Makefile.incl @@ -1,12 +1,11 @@ if MOO_BUILD_CTAGS -libmooeditplugins_la_SOURCES += \ - ctags/readtags.c \ - ctags/readtags.h \ - ctags/readtags-mangle.h \ - ctags/ctags-plugin.c \ - ctags/ctags-doc.c \ - ctags/ctags-doc.h \ - ctags/ctags-view.c \ - ctags/ctags-view.h -AM_CPPFLAGS += -DMOO_BUILD_CTAGS +plugins_sources += \ + plugins/ctags/readtags.c \ + plugins/ctags/readtags.h \ + plugins/ctags/readtags-mangle.h \ + plugins/ctags/ctags-plugin.c \ + plugins/ctags/ctags-doc.c \ + plugins/ctags/ctags-doc.h \ + plugins/ctags/ctags-view.c \ + plugins/ctags/ctags-view.h endif MOO_BUILD_CTAGS diff --git a/moo/plugins/moofileselector-prefs.c b/moo/plugins/moofileselector-prefs.c index 27c7977f..81871651 100644 --- a/moo/plugins/moofileselector-prefs.c +++ b/moo/plugins/moofileselector-prefs.c @@ -20,7 +20,7 @@ #include "mooutils/moostock.h" #include "mooutils/moohelp.h" #include "help-sections.h" -#include "glade/moofileselector-prefs-gxml.h" +#include "moofileselector-prefs-gxml.h" #include #include diff --git a/moo/plugins/moofileselector.c b/moo/plugins/moofileselector.c index c3db2e4d..663b1f0d 100644 --- a/moo/plugins/moofileselector.c +++ b/moo/plugins/moofileselector.c @@ -33,7 +33,7 @@ #include "mooutils/moo-mime.h" #include "mooutils/moomenu.h" #include "mooutils/moostat.h" -#include "glade/moofileselector-gxml.h" +#include "moofileselector-gxml.h" #include "mooutils/moohelp.h" #include "mooutils/mooatom.h" #include "help-sections.h" diff --git a/moo/plugins/moofind.c b/moo/plugins/moofind.c index 0e9bfe81..ae55d66f 100644 --- a/moo/plugins/moofind.c +++ b/moo/plugins/moofind.c @@ -29,8 +29,8 @@ #include "mooutils/mooi18n.h" #include "mooutils/moohelp.h" #include "mooutils/mooutils-fs.h" -#include "glade/moofind-gxml.h" -#include "glade/moogrep-gxml.h" +#include "moofind-gxml.h" +#include "moogrep-gxml.h" #include "help-sections.h" #include #include diff --git a/moo/plugins/script/Makefile.am b/moo/plugins/script/Makefile.am deleted file mode 100644 index ad136efb..00000000 --- a/moo/plugins/script/Makefile.am +++ /dev/null @@ -1,28 +0,0 @@ -noinst_LTLIBRARIES = libmomscript.la - -AM_CPPFLAGS = $(MOO_CPPFLAGS) -I$(top_srcdir)/moo -AM_CFLAGS = $(MOO_CFLAGS) -AM_CXXFLAGS = $(MOO_CXXFLAGS) - -libmomscript_la_SOURCES = \ - momscript-types.h \ - momscript-lua.h \ - momscript-lua.cpp \ - momscript-classes.h \ - momscript-classes.cpp \ - momscript-classes-meta.h \ - momscript.h \ - momscript.cpp \ - momscript-api.h \ - momscript-variant.h - -BUILT_SOURCES = momscript-classes-meta.h -CLEANFILES = momscript-classes-meta.h -EXTRA_DIST = genmeta.py -momscript-classes-meta.h: momscript-classes.h genmeta.py - $(PYTHON) $(srcdir)/genmeta.py $(srcdir)/momscript-classes.h > momscript-classes-meta.h.tmp && \ - mv momscript-classes-meta.h.tmp momscript-classes-meta.h - -momscript.t2t: momscript-classes.h momscript-classes.cpp gendoc.py - $(PYTHON) $(srcdir)/gendoc.py $(srcdir)/momscript-classes.h $(srcdir)/momscript-classes.cpp > $(srcdir)/momscript.t2t.tmp && \ - mv $(srcdir)/momscript.t2t.tmp $(srcdir)/momscript.t2t diff --git a/moo/plugins/script/Makefile.incl b/moo/plugins/script/Makefile.incl new file mode 100644 index 00000000..e8fcd150 --- /dev/null +++ b/moo/plugins/script/Makefile.incl @@ -0,0 +1,20 @@ +plugins_sources += \ + plugins/script/momscript-types.h \ + plugins/script/momscript-lua.h \ + plugins/script/momscript-lua.cpp \ + plugins/script/momscript-classes.h \ + plugins/script/momscript-classes.cpp \ + plugins/script/momscript.h \ + plugins/script/momscript.cpp \ + plugins/script/momscript-api.h \ + plugins/script/momscript-variant.h + +built_plugins_sources += momscript-classes-meta.h +EXTRA_DIST += plugins/script/genmeta.py +momscript-classes-meta.h: plugins/script/momscript-classes.h plugins/script/genmeta.py + $(PYTHON) $(srcdir)/plugins/script/genmeta.py $(srcdir)/plugins/script/momscript-classes.h > momscript-classes-meta.h.tmp && \ + mv momscript-classes-meta.h.tmp momscript-classes-meta.h + +plugins/script/momscript.t2t: plugins/script/momscript-classes.h plugins/script/momscript-classes.cpp plugins/script/gendoc.py + $(PYTHON) $(srcdir)/plugins/script/gendoc.py $(srcdir)/plugins/script/momscript-classes.h $(srcdir)/plugins/script/momscript-classes.cpp \ + > $(srcdir)/plugins/script/momscript.t2t.tmp && mv $(srcdir)/plugins/script/momscript.t2t.tmp $(srcdir)/plugins/script/momscript.t2t diff --git a/moo/plugins/usertools/Makefile.am b/moo/plugins/usertools/Makefile.am deleted file mode 100644 index d3d32848..00000000 --- a/moo/plugins/usertools/Makefile.am +++ /dev/null @@ -1,50 +0,0 @@ -noinst_LTLIBRARIES = libmoousertools.la - -AM_CPPFLAGS = $(MOO_CPPFLAGS) -I$(top_srcdir)/moo -I$(srcdir)/.. -I$(top_srcdir)/doc -AM_CFLAGS = $(MOO_CFLAGS) -AM_CXXFLAGS = $(MOO_CXXFLAGS) - -EXTRA_DIST = -BUILT_SOURCES = -CLEANFILES = - -libmoousertools_la_SOURCES = \ - moousertools.c \ - moousertools.h \ - moousertools-prefs.c \ - moousertools-prefs.h \ - moocommand.c \ - moocommand.h \ - moocommand-private.h \ - moocommanddisplay.c \ - moocommanddisplay.h \ - moooutputfilterregex.c \ - moooutputfilterregex.h \ - mookeyfile.c \ - mookeyfile.h \ - moousertools-enums.h \ - moousertools-enums.c - -include lua/Makefile.incl -include exe/Makefile.incl - -EXTRA_DIST += glade/moousertools.glade -BUILT_SOURCES += glade/moousertools-gxml.h -CLEANFILES += glade/moousertools-gxml.h - -include $(top_srcdir)/tools/rules.mk - -cfgdir = $(MOO_DATA_DIR) -cfg_DATA = filters.xml -EXTRA_DIST += \ - filters.xml \ - win32/menu.cfg \ - win32/context.cfg \ - unix/menu.cfg \ - unix/context.cfg - -if MOO_OS_WIN32 -cfg_DATA += win32/menu.cfg win32/context.cfg -else !MOO_OS_WIN32 -cfg_DATA += unix/menu.cfg unix/context.cfg -endif !MOO_OS_WIN32 diff --git a/moo/plugins/usertools/Makefile.incl b/moo/plugins/usertools/Makefile.incl new file mode 100644 index 00000000..6ed1dba5 --- /dev/null +++ b/moo/plugins/usertools/Makefile.incl @@ -0,0 +1,37 @@ +plugins_sources += \ + plugins/usertools/moousertools.c \ + plugins/usertools/moousertools.h \ + plugins/usertools/moousertools-prefs.c \ + plugins/usertools/moousertools-prefs.h \ + plugins/usertools/moocommand.c \ + plugins/usertools/moocommand.h \ + plugins/usertools/moocommand-private.h \ + plugins/usertools/moocommanddisplay.c \ + plugins/usertools/moocommanddisplay.h \ + plugins/usertools/moooutputfilterregex.c\ + plugins/usertools/moooutputfilterregex.h\ + plugins/usertools/mookeyfile.c \ + plugins/usertools/mookeyfile.h \ + plugins/usertools/moousertools-enums.h \ + plugins/usertools/moousertools-enums.c + +include plugins/usertools/lua/Makefile.incl +include plugins/usertools/exe/Makefile.incl + +EXTRA_DIST += plugins/usertools/glade/moousertools.glade +built_plugins_sources += moousertools-gxml.h + +cfgdir = $(MOO_DATA_DIR) +cfg_DATA = plugins/usertools/filters.xml +EXTRA_DIST += \ + plugins/usertools/filters.xml \ + plugins/usertools/win32/menu.cfg \ + plugins/usertools/win32/context.cfg \ + plugins/usertools/unix/menu.cfg \ + plugins/usertools/unix/context.cfg + +if MOO_OS_WIN32 +cfg_DATA += plugins/usertools/win32/menu.cfg plugins/usertools/win32/context.cfg +else !MOO_OS_WIN32 +cfg_DATA += plugins/usertools/unix/menu.cfg plugins/usertools/unix/context.cfg +endif !MOO_OS_WIN32 diff --git a/moo/plugins/usertools/exe/Makefile.incl b/moo/plugins/usertools/exe/Makefile.incl index ec3d1841..08cf9f67 100644 --- a/moo/plugins/usertools/exe/Makefile.incl +++ b/moo/plugins/usertools/exe/Makefile.incl @@ -1,11 +1,10 @@ if MOO_OS_UNIX -libmoousertools_la_SOURCES += \ - exe/moocommand-exe.c \ - exe/moocommand-exe.h +plugins_sources += \ + plugins/usertools/exe/moocommand-exe.c \ + plugins/usertools/exe/moocommand-exe.h -EXTRA_DIST += glade/mooedittools-exe.glade -BUILT_SOURCES += glade/mooedittools-exe-gxml.h -CLEANFILES += glade/mooedittools-exe-gxml.h +EXTRA_DIST += plugins/usertools/glade/mooedittools-exe.glade +built_plugins_sources += mooedittools-exe-gxml.h endif MOO_OS_UNIX diff --git a/moo/plugins/usertools/exe/moocommand-exe.c b/moo/plugins/usertools/exe/moocommand-exe.c index 7002763c..aa4b18bd 100644 --- a/moo/plugins/usertools/exe/moocommand-exe.c +++ b/moo/plugins/usertools/exe/moocommand-exe.c @@ -25,7 +25,7 @@ #include "mooutils/mooutils-debug.h" #include "mooutils/moospawn.h" #include "mooutils/mootype-macros.h" -#include "glade/mooedittools-exe-gxml.h" +#include "mooedittools-exe-gxml.h" #include #include diff --git a/moo/plugins/usertools/exe/moocommand-exe.h b/moo/plugins/usertools/exe/moocommand-exe.h index 1de0a690..b723f9eb 100644 --- a/moo/plugins/usertools/exe/moocommand-exe.h +++ b/moo/plugins/usertools/exe/moocommand-exe.h @@ -20,7 +20,7 @@ #error "__WIN32__" #endif -#include "moocommand.h" +#include "usertools/moocommand.h" #include G_BEGIN_DECLS diff --git a/moo/plugins/usertools/lua/Makefile.incl b/moo/plugins/usertools/lua/Makefile.incl index 5b94f56f..530c6491 100644 --- a/moo/plugins/usertools/lua/Makefile.incl +++ b/moo/plugins/usertools/lua/Makefile.incl @@ -1,22 +1,19 @@ -libmoousertools_la_SOURCES += \ - lua/moocommand-lua.cpp \ - lua/moocommand-lua.h \ - lua/mooedit-lua1.cpp \ - lua/mooedit-lua1.h \ - lua/mooedit-lua-api1.cpp\ - lua2-tool-setup.h +plugins_sources += \ + plugins/usertools/lua/moocommand-lua.cpp \ + plugins/usertools/lua/moocommand-lua.h \ + plugins/usertools/lua/mooedit-lua1.cpp \ + plugins/usertools/lua/mooedit-lua1.h \ + plugins/usertools/lua/mooedit-lua-api1.cpp -EXTRA_DIST += glade/mooedittools-lua.glade -BUILT_SOURCES += glade/mooedittools-lua-gxml.h -CLEANFILES += glade/mooedittools-lua-gxml.h +EXTRA_DIST += plugins/usertools/glade/mooedittools-lua.glade +built_plugins_sources += mooedittools-lua-gxml.h lua1dir = $(MOO_DATA_DIR)/lua -lua1_DATA = lua/medit.lua -EXTRA_DIST += lua/medit.lua +lua1_DATA = plugins/usertools/lua/medit.lua +EXTRA_DIST += plugins/usertools/lua/medit.lua -EXTRA_DIST += lua/lua2-tool-setup.lua -BUILT_SOURCES += lua2-tool-setup.h -CLEANFILES += lua2-tool-setup.h -lua2-tool-setup.h: lua/lua2-tool-setup.lua $(top_srcdir)/tools/xml2h.py - $(PYTHON) $(top_srcdir)/tools/xml2h.py $(srcdir)/lua/lua2-tool-setup.lua lua2-tool-setup.h.tmp LUA2_SETUP_CODE \ +EXTRA_DIST += plugins/usertools/lua/lua2-tool-setup.lua +built_plugins_sources += lua2-tool-setup.h +lua2-tool-setup.h: plugins/usertools/lua/lua2-tool-setup.lua $(top_srcdir)/tools/xml2h.py + $(PYTHON) $(top_srcdir)/tools/xml2h.py $(srcdir)/plugins/usertools/lua/lua2-tool-setup.lua lua2-tool-setup.h.tmp LUA2_SETUP_CODE \ && mv lua2-tool-setup.h.tmp lua2-tool-setup.h diff --git a/moo/plugins/usertools/lua/moocommand-lua.cpp b/moo/plugins/usertools/lua/moocommand-lua.cpp index 26194a6b..55711581 100644 --- a/moo/plugins/usertools/lua/moocommand-lua.cpp +++ b/moo/plugins/usertools/lua/moocommand-lua.cpp @@ -23,7 +23,7 @@ #include "mooutils/mooi18n.h" #include "mooutils/mooutils-misc.h" #include "mooutils/mootype-macros.h" -#include "glade/mooedittools-lua-gxml.h" +#include "mooedittools-lua-gxml.h" #include "moolua/moolua.h" #include diff --git a/moo/plugins/usertools/lua/moocommand-lua.h b/moo/plugins/usertools/lua/moocommand-lua.h index 2f4e420b..0041ee12 100644 --- a/moo/plugins/usertools/lua/moocommand-lua.h +++ b/moo/plugins/usertools/lua/moocommand-lua.h @@ -16,7 +16,7 @@ #ifndef MOO_COMMAND_LUA_H #define MOO_COMMAND_LUA_H -#include "moocommand.h" +#include "usertools/moocommand.h" G_BEGIN_DECLS diff --git a/moo/plugins/usertools/moousertools-prefs.c b/moo/plugins/usertools/moousertools-prefs.c index accd9b58..f5300f0d 100644 --- a/moo/plugins/usertools/moousertools-prefs.c +++ b/moo/plugins/usertools/moousertools-prefs.c @@ -21,7 +21,7 @@ #include "mooutils/mooi18n.h" #include "mooutils/mooutils-treeview.h" #include "mooutils/moohelp.h" -#include "glade/moousertools-gxml.h" +#include "moousertools-gxml.h" #include "help-sections.h" #include diff --git a/moo/xdgmime/Makefile.am b/moo/xdgmime/Makefile.am deleted file mode 100644 index 4ad40492..00000000 --- a/moo/xdgmime/Makefile.am +++ /dev/null @@ -1,22 +0,0 @@ -noinst_LTLIBRARIES = libxdgmime.la - -AM_CPPFLAGS = $(MOO_CPPFLAGS) -AM_CFLAGS = $(MOO_CFLAGS) -AM_CXXFLAGS = $(MOO_CXXFLAGS) - -libxdgmime_la_SOURCES = \ - xdgmimealias.c \ - xdgmimealias.h \ - xdgmime.c \ - xdgmimecache.c \ - xdgmimecache.h \ - xdgmimeglob.c \ - xdgmimeglob.h \ - xdgmime.h \ - xdgmimeint.h \ - xdgmimeicon.c \ - xdgmimeicon.h \ - xdgmimemagic.c \ - xdgmimemagic.h \ - xdgmimeparent.c \ - xdgmimeparent.h diff --git a/moo/xdgmime/Makefile.incl b/moo/xdgmime/Makefile.incl new file mode 100644 index 00000000..e9a91b47 --- /dev/null +++ b/moo/xdgmime/Makefile.incl @@ -0,0 +1,16 @@ +moo_sources += \ + xdgmime/xdgmimealias.c \ + xdgmime/xdgmimealias.h \ + xdgmime/xdgmime.c \ + xdgmime/xdgmimecache.c \ + xdgmime/xdgmimecache.h \ + xdgmime/xdgmimeglob.c \ + xdgmime/xdgmimeglob.h \ + xdgmime/xdgmime.h \ + xdgmime/xdgmimeint.h \ + xdgmime/xdgmimeicon.c \ + xdgmime/xdgmimeicon.h \ + xdgmime/xdgmimemagic.c \ + xdgmime/xdgmimemagic.h \ + xdgmime/xdgmimeparent.c \ + xdgmime/xdgmimeparent.h diff --git a/po-gsv/POTFILES.skip b/po-gsv/POTFILES.skip index 244a37d9..bc726421 100644 --- a/po-gsv/POTFILES.skip +++ b/po-gsv/POTFILES.skip @@ -1,8 +1,8 @@ build/ doc/ -medit/ -plugins/ +moo/medit-app/ +moo/plugins/ moo/mooapp/ moo/mooedit/glade/ moo/mooedit/plugins/ diff --git a/po/POTFILES.in b/po/POTFILES.in index 4b3758cb..d868b6a7 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -1,5 +1,5 @@ -medit/main.c -medit/medit.desktop.in +moo/medit-app/main.c +moo/medit-app/medit.desktop.in moo/eggsmclient/eggdesktopfile.c moo/eggsmclient/eggsmclient.c moo/gtksourceview/gtksourcecontextengine.c @@ -58,19 +58,19 @@ moo/mooutils/moostock.c moo/mooutils/mooutils-file.c moo/mooutils/mooutils-fs.c moo/mooutils/moowindow.c -plugins/glade/moofileselector.glade -plugins/glade/moofileselector-prefs.glade -plugins/glade/moofind.glade -plugins/glade/moogrep.glade -plugins/moofilelist.c -plugins/moofileselector.c -plugins/moofileselector-prefs.c -plugins/moofind.c -plugins/usertools/exe/moocommand-exe.c -plugins/usertools/filters.xml -plugins/usertools/glade/mooedittools-exe.glade -plugins/usertools/glade/mooedittools-lua.glade -plugins/usertools/glade/moousertools.glade -plugins/usertools/lua/moocommand-lua.cpp -plugins/usertools/moousertools.c -plugins/usertools/moousertools-prefs.c +moo/plugins/glade/moofileselector.glade +moo/plugins/glade/moofileselector-prefs.glade +moo/plugins/glade/moofind.glade +moo/plugins/glade/moogrep.glade +moo/plugins/moofilelist.c +moo/plugins/moofileselector.c +moo/plugins/moofileselector-prefs.c +moo/plugins/moofind.c +moo/plugins/usertools/exe/moocommand-exe.c +moo/plugins/usertools/filters.xml +moo/plugins/usertools/glade/mooedittools-exe.glade +moo/plugins/usertools/glade/mooedittools-lua.glade +moo/plugins/usertools/glade/moousertools.glade +moo/plugins/usertools/lua/moocommand-lua.cpp +moo/plugins/usertools/moousertools.c +moo/plugins/usertools/moousertools-prefs.c diff --git a/tools/rules.mk b/tools/rules.mk deleted file mode 100644 index 660bc23a..00000000 --- a/tools/rules.mk +++ /dev/null @@ -1,8 +0,0 @@ -glade/%-gxml.h: glade/%.glade $(top_srcdir)/tools/glade2c.py - $(MKDIR_P) glade - $(PYTHON) $(top_srcdir)/tools/glade2c.py $< > $@.tmp && mv $@.tmp $@ - -%-ui.h: %.xml $(top_srcdir)/tools/xml2h.py - $(PYTHON) $(top_srcdir)/tools/xml2h.py $< $@.tmp $*_ui_xml && mv $@.tmp $@ - -# -%- lang:makefile; strip:true; indent-width:8; use-tabs:true -%-