svn merge -r 797:814 svn+ssh://svn.berlios.de/svnroot/repos/ggap/moo/branches/non-recursive-make

Works very well
master
Yevgen Muntyan 2005-11-05 12:34:09 +00:00
parent 8c199d5e06
commit e528ffb219
39 changed files with 866 additions and 996 deletions

View File

@ -1,3 +1,4 @@
mooedit/mootextbtree.c: CHECK_INTEGRITY
mooutils/moofileview/moofoldermodel-private.h: DEFINE_CHECK_FILE_LIST_INTEGRITY
mooterm/mootermline.h: #if 0...
mooterm/mootermline.h: #if 0...
mooterm: remove dependency on yacc

View File

@ -1,7 +1,7 @@
EXTRA_DIST = makewin mingw-configure
DIST_SUBDIRS = moo tests m4
SUBDIRS = moo
DIST_SUBDIRS = tests m4
SUBDIRS = .
if !MOO_OS_CYGWIN
SUBDIRS += tests
@ -11,3 +11,55 @@ pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = moo.pc
ACLOCAL_AMFLAGS = -I m4
DEFAULT_INCLUDES =
AM_CFLAGS = \
-I$(top_builddir) \
-I$(top_srcdir)/$(MOO_SRC_PREFIX) \
-I$(top_builddir)/$(MOO_SRC_PREFIX) \
$(MOO_CFLAGS) \
$(PYTHON_INCLUDES) \
$(PYGTK_CFLAGS) \
$(MOO_DEBUG_CFLAGS) \
$(CFLAGS)
if !MOO_OS_CYGWIN
noinst_LTLIBRARIES = libmoo-1.0.la
endif
###########################################################################
EXTRA_PROGRAMS =
moo_prefix = moo
XML2H = $(srcdir)/moo/mooutils/xml2h.sh
include moo/Makefile.incl
include moo/mooutils/Makefile.incl
include moo/mooedit/Makefile.incl
include moo/mooterm/Makefile.incl
include moo/mooapp/Makefile.incl
include moo/moopython/Makefile.incl
###########################################################################
CLEANFILES = $(moo_cleanfiles)
if !MOO_OS_CYGWIN
libmoo_1_0_la_LDFLAGS = -version-info $(LTVERSION) -export-symbols-regex "^[^_].*" -no-undefined
libmoo_1_0_la_SOURCES = $(moo_built_sources) $(moo_sources)
BUILT_SOURCES = $(moo_built_sources)
nodist_libmoo_1_0_la_SOURCES = $(moo_nodist_sources)
if MOO_OS_MINGW
libmoo_1_0_la_SOURCES += $(moo_win32_sources)
endif
if MOO_OS_UNIX
libmoo_1_0_la_SOURCES += $(moo_unix_sources)
endif
endif
EXTRA_DIST += \
$(moo_sources) \
$(moo_win32_sources) \
$(moo_unix_sources) \
$(moo_built_sources) \
$(moo_extra_dist)

View File

@ -223,25 +223,7 @@ AM_CONDITIONAL(MOO_STANDALONE, true)
AC_OUTPUT([
Makefile
moo/moo-config.h
moo/Makefile
moo/mooapp/Makefile
moo/mooapp/glade/Makefile
moo/mooedit/Makefile
moo/mooedit/glade/Makefile
moo/mooedit/syntax/Makefile
moo/mooedit/plugins/Makefile
moo/mooterm/Makefile
moo/mooterm/termhelper_res.rc
moo/mooterm/glade/Makefile
moo/mooutils/Makefile
moo/mooutils/glade/Makefile
moo/mooutils/newgtk/Makefile
moo/mooutils/pcre/Makefile
moo/mooutils/pixmaps/Makefile
moo/mooutils/moofileview/Makefile
moo/mooutils/moofileview/glade/Makefile
moo/mooutils/xdgmime/Makefile
moo/moopython/Makefile
tests/Makefile
tests/pyapp.py
m4/Makefile

View File

@ -61,6 +61,6 @@ fi
ln -s $0 fake-pkg-config
export PKG_CONFIG="./fake-pkg-config"
TARGET=i586-mingw32msvc
TARGET=i586-pc-mingw32msvc
exec sh $CONFIGURE --target=$TARGET --host=$TARGET --without-native-gnu-regex $*

View File

@ -24,7 +24,7 @@
</ignoreparts>
<projectdirectory>.</projectdirectory>
<absoluteprojectpath>false</absoluteprojectpath>
<description></description>
<description/>
<secondaryLanguages>
<language>C</language>
</secondaryLanguages>
@ -39,7 +39,7 @@
<mainprogram>tests/medit</mainprogram>
<directoryradio>executable</directoryradio>
<customdirectory>/</customdirectory>
<programargs></programargs>
<programargs/>
<terminal>false</terminal>
<autocompile>false</autocompile>
<envvars/>
@ -192,7 +192,7 @@
<abortonerror>true</abortonerror>
<numberofjobs>3</numberofjobs>
<dontact>false</dontact>
<makebin></makebin>
<makebin/>
<prio>0</prio>
</make>
</kdevautoproject>
@ -200,10 +200,10 @@
<general>
<dbgshell>libtool</dbgshell>
<programargs>--g-fatal-warnings </programargs>
<gdbpath></gdbpath>
<configGdbScript></configGdbScript>
<runShellScript></runShellScript>
<runGdbScript></runGdbScript>
<gdbpath/>
<configGdbScript/>
<runShellScript/>
<runGdbScript/>
<breakonloadinglibs>true</breakonloadinglibs>
<separatetty>false</separatetty>
<floatingtoolbar>true</floatingtoolbar>
@ -304,7 +304,7 @@
</codecompletion>
<references/>
<creategettersetter>
<prefixGet></prefixGet>
<prefixGet/>
<prefixSet>set</prefixSet>
<prefixVariable>m_,_</prefixVariable>
<parameterName>theValue</parameterName>

View File

@ -1,106 +0,0 @@
#
# moo/Makefile.am
#
LTVERSION = 0:1:0
DIST_SUBDIRS = \
mooapp \
mooutils \
mooedit \
moopython \
mooterm
mooinclude_headers = moo.h
moolibinclude_headers = moo-config.h
if MOO_STANDALONE
mooincludedir = $(includedir)/moo-1.0
mooinclude_HEADERS = $(mooinclude_headers)
moolibincludedir = $(libdir)/moo-1.0/include
moolibinclude_HEADERS = $(moolibinclude_headers)
endif MOO_STANDALONE
EXTRA_DIST = \
$(mooinclude_headers) \
$(moolibinclude_headers) \
TODO
# lib_LTLIBRARIES = libmoo-1.0.la
noinst_LTLIBRARIES = libmoo-1.0.la
libmoo_1_0_la_SOURCES = \
dummy.c
all-am: moo-config.h
moo_libadd =
subdirs =
if MOO_BUILD_UTILS
subdirs += mooutils
moo_libadd += mooutils/libmooutils.la
endif
if MOO_BUILD_EDIT
subdirs += mooedit
moo_libadd += mooedit/libmooedit.la
endif
if MOO_BUILD_TERM
subdirs += mooterm
if !MOO_OS_CYGWIN
moo_libadd += mooterm/libmooterm.la
endif !MOO_OS_CYGWIN
endif
if MOO_BUILD_APP
subdirs += mooapp
if !MOO_OS_CYGWIN
moo_libadd += mooapp/libmooapp.la
endif !MOO_OS_CYGWIN
endif
if MOO_USE_PYGTK
subdirs += moopython
moo_libadd += moopython/libmoopython.la
endif
libmoo_1_0_la_LIBADD = $(moo_libadd)
libmoo_1_0_la_LDFLAGS = -version-info $(LTVERSION) -export-symbols-regex "^[^_].*" -no-undefined
SUBDIRS = $(subdirs) .
DEFAULT_INCLUDES =
AM_CFLAGS = \
-I$(top_builddir) \
$(MOO_CFLAGS) \
$(PYTHON_INCLUDES) \
$(PYGTK_CFLAGS) \
$(MOO_DEBUG_CFLAGS) \
$(CFLAGS)
# ##############################################################################
# # moo module
# #
# if BUILD_PYMOO
#
# pyexec_LTLIBRARIES = moo.la
#
# moo_la_SOURCES = $(libmoo_1_0_SOURCES)
#
# if MOO_OS_MINGW
# mingw_flags = -no-undefined
# endif MOO_OS_MINGW
#
# moo_la_LDFLAGS = -module -avoid-version -export-symbols-regex initmoo $(mingw_flags)
#
# moo_la_LIBADD = \
# $(libmoo_la_LIBADD) \
# $(GTK_LIBS) \
# $(XML_LIBS) \
# $(PYTHON_LDFLAGS) \
# $(PYTHON_EXTRA_LIBS)
#
# endif BUILD_PYMOO

15
moo/Makefile.incl Normal file
View File

@ -0,0 +1,15 @@
#
# moo/Makefile.incl
#
moo_sources =
moo_win32_sources =
moo_unix_sources =
moo_built_sources =
moo_nodist_sources =
moo_noinst_programs =
moo_cleanfiles =
moo_extra_dist = \
$(moo_prefix)/moo.h \
$(moo_prefix)/TODO

View File

@ -1 +0,0 @@
/* empty file to make automake happy */

View File

@ -1,60 +0,0 @@
#
# mooapp/Makefile.am
#
SUBDIRS = glade
DEFAULT_INCLUDES =
AM_CFLAGS = \
-I$(top_builddir) \
-I$(top_builddir)/$(MOO_SRC_PREFIX) \
$(PYTHON_INCLUDES) \
$(PYGTK_CFLAGS) \
$(MOO_CFLAGS) \
$(MOO_DEBUG_CFLAGS) \
$(CFLAGS)
noinst_LTLIBRARIES = libmooapp.la
BUILT_SOURCES = mooappabout-glade.h
libmooapp_la_SOURCES = \
mooappabout-glade.h \
mooappdialogs.c \
mooapp-prefs.c \
mooapp-private.h \
mooapp.c \
mooapp.h \
mooappinput.c \
mooappinput.h \
mooappoutput.c \
mooappoutput.h
if MOO_USE_PYTHON
libmooapp_la_SOURCES += \
mooapp-python.h \
moopythonconsole.c \
moopythonconsole.h \
moopython.c \
moopython.h
endif MOO_USE_PYTHON
EXTRA_DIST = \
gpl \
moopython.c \
moopython.h \
moopythonconsole.c \
moopythonconsole.h
if MOO_STANDALONE
mooappincludedir = $(includedir)/moo-1.0/mooapp
mooappinclude_HEADERS = mooapp.h
endif MOO_STANDALONE
GLADE = $(srcdir)/glade
XML2SH = $(srcdir)/../mooutils/xml2h.sh
SUPPORT = $(top_srcdir)/$(MOO_SRC_PREFIX)/mooutils/glade/support.sh
mooappabout-glade.h: $(GLADE)/mooappabout.glade
sh $(XML2SH) MOO_APP_ABOUT_GLADE_UI $(GLADE)/mooappabout.glade > mooappabout-glade.h

57
moo/mooapp/Makefile.incl Normal file
View File

@ -0,0 +1,57 @@
#
# moo/mooapp/Makefile.incl
#
mooapp = $(moo_prefix)/mooapp
mooapp_srcdir = $(srcdir)/$(mooapp)
###########################################################################
# mooapp/glade
#
mooapp_glade = $(mooapp)/glade
moo_extra_dist += \
$(mooapp_glade)/mooappabout.glade
###########################################################################
# mooapp
#
mooapp_built_sources = \
$(mooapp)/mooappabout-glade.h
mooapp_sources = \
$(mooapp)/mooappdialogs.c \
$(mooapp)/mooapp-prefs.c \
$(mooapp)/mooapp-private.h \
$(mooapp)/mooapp.c \
$(mooapp)/mooapp.h \
$(mooapp)/mooappinput.c \
$(mooapp)/mooappinput.h \
$(mooapp)/mooappoutput.c \
$(mooapp)/mooappoutput.h
mooapp_python_sources = \
$(mooapp)/mooapp-python.h \
$(mooapp)/moopythonconsole.c \
$(mooapp)/moopythonconsole.h \
$(mooapp)/moopython.c \
$(mooapp)/moopython.h
if MOO_USE_PYTHON
mooapp_sources += $(mooapp_python_sources)
endif MOO_USE_PYTHON
mooapp_extra_dist = \
$(mooapp)/gpl \
$(mooapp_python_sources)
$(mooapp)/mooappabout-glade.h: $(mooapp_srcdir)/glade/mooappabout.glade
mkdir -p $(mooapp)
sh $(XML2H) MOO_APP_ABOUT_GLADE_UI $(mooapp_srcdir)/glade/mooappabout.glade > $(mooapp)/mooappabout-glade.h
moo_sources += $(mooapp_sources)
moo_built_sources += $(mooapp_built_sources)
moo_extra_dist += $(mooapp_extra_dist)

View File

@ -1,6 +0,0 @@
#
# mooapp/glade/Makefile.am,v 1.3.2.1 2005/06/20 09:07:39 emuntyan Exp $
#
EXTRA_DIST = \
mooappabout.glade

View File

@ -1,135 +0,0 @@
#
# mooedit/Makefile.am
#
SUBDIRS = glade syntax plugins .
DEFAULT_INCLUDES =
AM_CFLAGS = \
-I$(top_builddir) \
-I$(top_builddir)/$(MOO_SRC_PREFIX) \
$(MOO_CFLAGS) \
$(MOO_DEBUG_CFLAGS) \
$(CFLAGS)
noinst_LTLIBRARIES = libmooedit.la
mooeditinclude_headers = \
mooedit.h \
mooeditor.h \
mooeditprefs.h \
mooeditsearch.h \
mooeditwindow.h \
mooindenter.h \
moolang.h \
moolangmgr.h \
moolineview.h \
mooplugin-macro.h \
mooplugin.h \
mootextbuffer.h \
mootextiter.h \
mootextstyle.h \
mootextstylescheme.h \
mootextview.h
noinst_HEADERS = \
gtksourceiter.h \
mooedit-private.h \
mooeditcolorsprefs-glade.h \
mooeditdialogs.h \
mooeditfileops.h \
mooeditfind-glade.h \
mooeditgotoline-glade.h \
mooeditprefs-glade.h \
moohighlighter.h \
moolang-aux.h \
moolang-parser.h \
moolang-rules.h \
moolang-strings.h \
moolinebuffer.h \
moopluginprefs-glade.h \
mootextbtree.h \
mootextview-private.h
unix_sources = moocmdview.c
unix_headers = moocmdview.h
if !MOO_OS_MINGW
use_unix_sources = $(unix_sources)
mooeditinclude_headers += $(unix_headers)
endif
EXTRA_DIST = \
$(unix_sources) \
$(unix_headers)
libmooedit_la_SOURCES = \
$(use_unix_sources) \
$(mooeditinclude_headers) \
$(noinst_HEADERS) \
gtksourceiter.c \
mooedit.c \
mooeditdialogs.c \
mooeditfileops.c \
mooeditfind.c \
mooeditinput.c \
mooeditor.c \
mooeditprefs.c \
mooeditprefspage.c \
mooeditsearch.c \
mooeditwindow.c \
moohighlighter.c \
mooindenter.c \
moolang.c \
moolangmgr.c \
moolang-parser.c \
moolang-rules.c \
moolinebuffer.c \
moolineview.c \
mooplugin.c \
mootextbtree.c \
mootextbuffer.c \
mootextstyle.c \
mootextstylescheme.c \
mootextview.c
libmooedit_la_LIBADD = \
plugins/libplugins.la
BUILT_SOURCES = \
mooeditgotoline-glade.h \
mooeditfind-glade.h \
moopluginprefs-glade.h \
mooeditprefs-glade.h \
mooeditcolorsprefs-glade.h
if MOO_STANDALONE
mooeditincludedir = $(includedir)/moo-1.0/mooedit
mooeditinclude_HEADERS = $(mooeditinclude_headers)
endif MOO_STANDALONE
GLADE = $(srcdir)/glade
XML2H = $(srcdir)/../mooutils/xml2h.sh
mooeditgotoline-glade.h: $(GLADE)/mooeditgotoline.glade
sh $(XML2H) MOO_EDIT_GOTO_LINE_GLADE_UI $(GLADE)/mooeditgotoline.glade \
> mooeditgotoline-glade.h
mooeditfind-glade.h: $(GLADE)/mooeditfind.glade
sh $(XML2H) MOO_EDIT_FIND_GLADE_UI $(GLADE)/mooeditfind.glade \
> mooeditfind-glade.h
mooeditprefs-glade.h: $(GLADE)/mooeditprefs.glade
sh $(XML2H) MOO_EDIT_PREFS_GLADE_UI $(GLADE)/mooeditprefs.glade \
> mooeditprefs-glade.h
mooeditcolorsprefs-glade.h: $(GLADE)/mooeditcolorsprefs.glade
sh $(XML2H) MOO_EDIT_COLORS_PREFS_GLADE_UI $(GLADE)/mooeditcolorsprefs.glade \
> mooeditcolorsprefs-glade.h
moopluginprefs-glade.h: $(GLADE)/moopluginprefs.glade
sh $(XML2H) MOO_PLUGIN_PREFS_GLADE_UI $(GLADE)/moopluginprefs.glade \
> moopluginprefs-glade.h

187
moo/mooedit/Makefile.incl Normal file
View File

@ -0,0 +1,187 @@
#
# moo/mooedit/Makefile.incl
#
mooedit = $(moo_prefix)/mooedit
mooedit_srcdir = $(srcdir)/$(mooedit)
###########################################################################
# mooedit/glade
#
mooedit_glade = $(mooedit)/glade
moo_extra_dist += \
$(mooedit_glade)/mooeditgotoline.glade \
$(mooedit_glade)/mooeditfind.glade \
$(mooedit_glade)/mooeditprefs.glade \
$(mooedit_glade)/mooeditcolorsprefs.glade \
$(mooedit_glade)/moopluginprefs.glade
###########################################################################
# mooedit/syntax
#
mooedit_syntax = $(mooedit)/syntax
mooedit_syntaxdir = ${MOO_TEXT_LANG_FILES_DIR}
mooedit_syntax_DATA = \
$(mooedit_syntax)/gap.lang \
$(mooedit_syntax)/c.lang \
$(mooedit_syntax)/diff.lang \
$(mooedit_syntax)/make.lang \
$(mooedit_syntax)/misc.lang \
$(mooedit_syntax)/python.lang \
$(mooedit_syntax)/sh.lang \
$(mooedit_syntax)/xml.lang \
$(mooedit_syntax)/garnacho.styles \
$(mooedit_syntax)/gvim.styles \
$(mooedit_syntax)/check.sh \
$(mooedit_syntax)/language.dtd \
$(mooedit_syntax)/scheme.dtd
moo_extra_dist += $(mooedit_syntax_DATA)
###########################################################################
# mooedit/plugins
#
mooedit_plugins = $(mooedit)/plugins
mooedit_plugins_srcdir = $(srcdir)/$(mooedit_plugins)
mooedit_plugins_built_sources = \
$(mooedit_plugins)/moofind-glade.h
mooedit_plugins_extra_dist = \
$(mooedit_plugins)/moofind.glade \
$(mooedit_plugins)/moofind-glade.h \
$(mooedit_plugins)/console.c
$(mooedit_plugins)/moofind-glade.h: $(mooedit_plugins)/moofind.glade
mkdir -p $(mooedit_plugins)
sh $(XML2H) MOO_FIND_GLADE_XML $(mooedit_plugins_srcdir)/moofind.glade > \
$(mooedit_plugins)/moofind-glade.h
mooedit_plugins_unix_sources = \
$(mooedit_plugins)/moofind.c \
$(mooedit_plugins)/moofind-glade.h \
$(mooedit_plugins)/fileselector.c
if MOO_BUILD_TERM
mooedit_plugins_unix_sources += $(mooedit_plugins)/console.c
endif
mooedit_plugins_sources = \
$(mooedit_plugins)/activestrings.c \
$(mooedit_plugins)/mooeditplugins.h
moo_sources += $(mooedit_plugins_sources)
moo_unix_sources += $(mooedit_plugins_unix_sources)
moo_built_sources += $(mooedit_plugins_built_sources)
moo_extra_dist += $(mooedit_plugins_extra_dist)
###########################################################################
# mooedit
#
mooeditinclude_headers = \
$(mooedit)/mooedit.h \
$(mooedit)/mooeditor.h \
$(mooedit)/mooeditprefs.h \
$(mooedit)/mooeditsearch.h \
$(mooedit)/mooeditwindow.h \
$(mooedit)/mooindenter.h \
$(mooedit)/moolang.h \
$(mooedit)/moolangmgr.h \
$(mooedit)/moolineview.h \
$(mooedit)/mooplugin-macro.h \
$(mooedit)/mooplugin.h \
$(mooedit)/mootextbuffer.h \
$(mooedit)/mootextiter.h \
$(mooedit)/mootextstyle.h \
$(mooedit)/mootextstylescheme.h \
$(mooedit)/mootextview.h
mooedit_noinst_headers = \
$(mooedit)/gtksourceiter.h \
$(mooedit)/moocmdview.h \
$(mooedit)/mooedit-private.h \
$(mooedit)/mooeditcolorsprefs-glade.h \
$(mooedit)/mooeditdialogs.h \
$(mooedit)/mooeditfileops.h \
$(mooedit)/mooeditfind-glade.h \
$(mooedit)/mooeditgotoline-glade.h \
$(mooedit)/mooeditprefs-glade.h \
$(mooedit)/moohighlighter.h \
$(mooedit)/moolang-aux.h \
$(mooedit)/moolang-parser.h \
$(mooedit)/moolang-rules.h \
$(mooedit)/moolang-strings.h \
$(mooedit)/moolinebuffer.h \
$(mooedit)/moopluginprefs-glade.h \
$(mooedit)/mootextbtree.h \
$(mooedit)/mootextview-private.h
mooedit_unix_sources = $(mooedit)/moocmdview.c
mooedit_sources = \
$(mooeditinclude_headers) \
$(mooedit_noinst_headers) \
$(mooedit)/gtksourceiter.c \
$(mooedit)/mooedit.c \
$(mooedit)/mooeditdialogs.c \
$(mooedit)/mooeditfileops.c \
$(mooedit)/mooeditfind.c \
$(mooedit)/mooeditinput.c \
$(mooedit)/mooeditor.c \
$(mooedit)/mooeditprefs.c \
$(mooedit)/mooeditprefspage.c \
$(mooedit)/mooeditsearch.c \
$(mooedit)/mooeditwindow.c \
$(mooedit)/moohighlighter.c \
$(mooedit)/mooindenter.c \
$(mooedit)/moolang.c \
$(mooedit)/moolangmgr.c \
$(mooedit)/moolang-parser.c \
$(mooedit)/moolang-rules.c \
$(mooedit)/moolinebuffer.c \
$(mooedit)/moolineview.c \
$(mooedit)/mooplugin.c \
$(mooedit)/mootextbtree.c \
$(mooedit)/mootextbuffer.c \
$(mooedit)/mootextstyle.c \
$(mooedit)/mootextstylescheme.c \
$(mooedit)/mootextview.c
mooedit_built_sources = \
$(mooedit)/mooeditgotoline-glade.h \
$(mooedit)/mooeditfind-glade.h \
$(mooedit)/moopluginprefs-glade.h \
$(mooedit)/mooeditprefs-glade.h \
$(mooedit)/mooeditcolorsprefs-glade.h
$(mooedit)/mooeditgotoline-glade.h: $(mooedit_srcdir)/glade/mooeditgotoline.glade
sh $(XML2H) MOO_EDIT_GOTO_LINE_GLADE_UI $(mooedit_srcdir)/glade/mooeditgotoline.glade \
> $(mooedit)/mooeditgotoline-glade.h
$(mooedit)/mooeditfind-glade.h: $(mooedit_srcdir)/glade/mooeditfind.glade
sh $(XML2H) MOO_EDIT_FIND_GLADE_UI $(mooedit_srcdir)/glade/mooeditfind.glade \
> $(mooedit)/mooeditfind-glade.h
$(mooedit)/mooeditprefs-glade.h: $(mooedit_srcdir)/glade/mooeditprefs.glade
sh $(XML2H) MOO_EDIT_PREFS_GLADE_UI $(mooedit_srcdir)/glade/mooeditprefs.glade \
> $(mooedit)/mooeditprefs-glade.h
$(mooedit)/mooeditcolorsprefs-glade.h: $(mooedit_srcdir)/glade/mooeditcolorsprefs.glade
sh $(XML2H) MOO_EDIT_COLORS_PREFS_GLADE_UI $(mooedit_srcdir)/glade/mooeditcolorsprefs.glade \
> $(mooedit)/mooeditcolorsprefs-glade.h
$(mooedit)/moopluginprefs-glade.h: $(mooedit_srcdir)/glade/moopluginprefs.glade
sh $(XML2H) MOO_PLUGIN_PREFS_GLADE_UI $(mooedit_srcdir)/glade/moopluginprefs.glade \
> $(mooedit)/moopluginprefs-glade.h
moo_sources += $(mooedit_sources)
moo_built_sources += $(mooedit_built_sources)
moo_unix_sources += $(mooedit_unix_sources)

View File

@ -1,10 +0,0 @@
#
# mooedit/glade/Makefile.am
#
EXTRA_DIST = \
mooeditgotoline.glade \
mooeditfind.glade \
mooeditprefs.glade \
mooeditcolorsprefs.glade\
moopluginprefs.glade

View File

@ -899,12 +899,15 @@ moo_edit_filename_changed (MooEdit *edit,
const char *filename)
{
MooLang *lang = NULL;
Value *value;
g_hash_table_foreach_remove (edit->priv->vars, (GHRFunc) check_dep, NULL);
try_mode (edit);
if (!moo_edit_get_var (edit, MOO_EDIT_VAR_LANG))
value = get_value (edit, MOO_EDIT_VAR_LANG);
if (!value || value->dep >= MOO_EDIT_VAR_DEP_FILENAME)
{
if (filename)
{

View File

@ -705,8 +705,9 @@ moo_editor_add_doc (MooEditor *editor,
g_hash_table_insert (editor->priv->loaders, doc, moo_edit_loader_ref (loader));
g_hash_table_insert (editor->priv->savers, doc, moo_edit_saver_ref (saver));
if (!moo_edit_get_var (doc, MOO_EDIT_VAR_LANG) && editor->priv->default_lang)
moo_edit_set_var (doc, MOO_EDIT_VAR_LANG, editor->priv->default_lang);
if (!moo_edit_get_filename (doc) &&
!moo_edit_get_var (doc, MOO_EDIT_VAR_LANG) && editor->priv->default_lang)
moo_edit_set_var (doc, MOO_EDIT_VAR_LANG, editor->priv->default_lang);
}

View File

@ -451,7 +451,7 @@ static void moo_edit_window_class_init (MooEditWindowClass *klass)
"label", "_Go to Line",
"tooltip", "Go to line",
"accel", "<ctrl>G",
"closure::signal", "goto-line",
"closure::signal", "goto-line-interactive",
"closure::proxy-func", moo_edit_window_get_active_doc,
"condition::sensitive", "has-open-document",
NULL);

View File

@ -179,7 +179,8 @@ moo_text_style_mask_get_type (void)
{ MOO_TEXT_STYLE_BOLD, (char*) "MOO_TEXT_STYLE_BOLD", (char*) "bold" },
{ MOO_TEXT_STYLE_ITALIC, (char*) "MOO_TEXT_STYLE_ITALIC", (char*) "italic" },
{ MOO_TEXT_STYLE_UNDERLINE, (char*) "MOO_TEXT_STYLE_UNDERLINE", (char*) "underline" },
{ MOO_TEXT_STYLE_STRIKETHROUGH, (char*) "MOO_TEXT_STYLE_STRIKETHROUGH", (char*) "strikethrough" }
{ MOO_TEXT_STYLE_STRIKETHROUGH, (char*) "MOO_TEXT_STYLE_STRIKETHROUGH", (char*) "strikethrough" },
{ 0, NULL, NULL }
};
type = g_flags_register_static ("MooTextStyleMask", values);

View File

@ -1,35 +0,0 @@
#
# mooedit/plugins/Makefile.am
#
DEFAULT_INCLUDES =
AM_CFLAGS = \
-I$(top_builddir) \
-I$(top_builddir)/$(MOO_SRC_PREFIX) \
$(MOO_CFLAGS) \
$(MOO_DEBUG_CFLAGS) \
$(CFLAGS)
noinst_LTLIBRARIES = libplugins.la
if !MOO_OS_MINGW
unix_sources = \
moofind.c \
moofind-glade.h \
fileselector.c
if MOO_BUILD_TERM
unix_sources += console.c
endif
endif
libplugins_la_SOURCES = \
$(unix_sources) \
activestrings.c \
mooeditplugins.h
BUILT_SOURCES = moofind-glade.h
EXTRA_DIST = moofind.glade moofind-glade.h
moofind-glade.h: moofind.glade
sh $(srcdir)/../../mooutils/xml2h.sh MOO_FIND_GLADE_XML $(srcdir)/moofind.glade > \
moofind-glade.h

View File

@ -1,21 +0,0 @@
#
# mooedit/language-specs/Makefile.am
#
lang_filesdir = ${MOO_TEXT_LANG_FILES_DIR}
lang_files_DATA = \
gap.lang \
c.lang \
diff.lang \
make.lang \
misc.lang \
python.lang \
sh.lang \
xml.lang \
garnacho.styles \
gvim.styles \
check.sh \
language.dtd \
scheme.dtd
EXTRA_DIST = $(lang_files_DATA)

View File

@ -1,102 +0,0 @@
#
# moopython/Makefile.am
#
DEFAULT_INCLUDES =
AM_CFLAGS = \
-I$(top_builddir) \
-I$(top_builddir)/$(MOO_SRC_PREFIX) \
$(MOO_CFLAGS) \
$(MOO_PYTHON_DEBUG_CFLAGS) \
$(CFLAGS) \
$(GTK_CFLAGS) \
$(PYTHON_INCLUDES) \
$(PYGTK_CFLAGS)
noinst_LTLIBRARIES = libmoopython.la
libmoopython_la_SOURCES = moo-pygtk.c
EXTRA_DIST = \
mooapp-mod.c \
mooapp-pygtk.defs \
mooapp-pygtk.override \
mooedit-mod.c \
mooedit-pygtk.defs \
mooedit-pygtk.override \
mooterm-mod.c \
mooterm-pygtk.defs \
mooterm-pygtk.override \
mooutils-mod.c \
mooutils-pygtk.defs \
mooutils-pygtk.override
nodist_libmoopython_la_SOURCES =
BUILT_SOURCES =
CLEANFILES =
if MOO_BUILD_UTILS
libmoopython_la_SOURCES += mooutils-mod.c
nodist_libmoopython_la_SOURCES += mooutils-pygtk.c
BUILT_SOURCES += mooutils-pygtk.c
CLEANFILES += mooutils-pygtk.c
endif MOO_BUILD_UTILS
if MOO_BUILD_TERM
libmoopython_la_SOURCES += mooterm-mod.c
nodist_libmoopython_la_SOURCES += mooterm-pygtk.c
BUILT_SOURCES += mooterm-pygtk.c
CLEANFILES += mooterm-pygtk.c
endif MOO_BUILD_TERM
if MOO_BUILD_EDIT
libmoopython_la_SOURCES += mooedit-mod.c
nodist_libmoopython_la_SOURCES += mooedit-pygtk.c
BUILT_SOURCES += mooedit-pygtk.c
CLEANFILES += mooedit-pygtk.c
endif MOO_BUILD_EDIT
if MOO_BUILD_APP
libmoopython_la_SOURCES += mooapp-mod.c
nodist_libmoopython_la_SOURCES += mooapp-pygtk.c
BUILT_SOURCES += mooapp-pygtk.c
CLEANFILES += mooapp-pygtk.c
endif MOO_BUILD_APP
mooutils-pygtk.c: $(srcdir)/mooutils-pygtk.defs $(srcdir)/mooutils-pygtk.override
pygtk-codegen-2.0 --prefix moo_utils \
--register $(PYGTK_DEFS_DIR)/gtk-types.defs \
--register $(PYGTK_DEFS_DIR)/gdk-types.defs \
--override $(srcdir)/mooutils-pygtk.override \
--outfilename mooutils-pygtk.c \
$(srcdir)/mooutils-pygtk.defs > mooutils-pygtk.c
mooterm-pygtk.c: $(srcdir)/mooterm-pygtk.defs $(srcdir)/mooterm-pygtk.override
pygtk-codegen-2.0 --prefix moo_term \
--register $(PYGTK_DEFS_DIR)/gtk-types.defs \
--register $(PYGTK_DEFS_DIR)/gdk-types.defs \
--register $(srcdir)/mooutils-pygtk.defs \
--override $(srcdir)/mooterm-pygtk.override \
--outfilename mooterm-pygtk.c \
$(srcdir)/mooterm-pygtk.defs > mooterm-pygtk.c
mooedit-pygtk.c: $(srcdir)/mooedit-pygtk.defs $(srcdir)/mooedit-pygtk.override
pygtk-codegen-2.0 --prefix moo_edit \
--register $(PYGTK_DEFS_DIR)/gtk-types.defs \
--register $(PYGTK_DEFS_DIR)/gdk-types.defs \
--register $(srcdir)/mooutils-pygtk.defs \
--override $(srcdir)/mooedit-pygtk.override \
--outfilename mooedit-pygtk.c \
$(srcdir)/mooedit-pygtk.defs > mooedit-pygtk.c
mooapp-pygtk.c: $(srcdir)/mooapp-pygtk.defs $(srcdir)/mooapp-pygtk.override
pygtk-codegen-2.0 --prefix moo_app \
--register $(PYGTK_DEFS_DIR)/gtk-types.defs \
--register $(PYGTK_DEFS_DIR)/gdk-types.defs \
--register $(srcdir)/mooedit-pygtk.defs \
--register $(srcdir)/mooterm-pygtk.defs \
--register $(srcdir)/mooutils-pygtk.defs \
--override $(srcdir)/mooapp-pygtk.override \
--outfilename mooapp-pygtk.c \
$(srcdir)/mooapp-pygtk.defs > mooapp-pygtk.c

108
moo/moopython/Makefile.incl Normal file
View File

@ -0,0 +1,108 @@
#
# moo/moopython/Makefile.incl
#
moopython = $(moo_prefix)/moopython
moopython_srcdir = $(srcdir)/$(moopython)
moopython_sources = \
$(moopython)/moo-pygtk.c
nodist_moopython_sources =
moopython_built_sources =
moopython_cleanfiles =
moopython_extra_dist = \
$(moopython)/moo-pygtk.c \
$(moopython)/mooapp-pygtk.defs \
$(moopython)/mooapp-pygtk.override \
$(moopython)/mooapp-mod.c \
$(moopython)/mooedit-pygtk.defs \
$(moopython)/mooedit-pygtk.override \
$(moopython)/mooedit-mod.c \
$(moopython)/mooterm-pygtk.defs \
$(moopython)/mooterm-pygtk.override \
$(moopython)/mooterm-mod.c \
$(moopython)/mooutils-pygtk.defs \
$(moopython)/mooutils-pygtk.override \
$(moopython)/mooutils-mod.c
if MOO_BUILD_UTILS
moopython_sources += $(moopython)/mooutils-mod.c
nodist_moopython_sources += $(moopython)/mooutils-pygtk.c
moopython_built_sources += $(moopython)/mooutils-pygtk.c
moopython_cleanfiles += $(moopython)/mooutils-pygtk.c
endif MOO_BUILD_UTILS
if MOO_BUILD_TERM
moopython_sources += $(moopython)/mooterm-mod.c
nodist_moopython_sources += $(moopython)/mooterm-pygtk.c
moopython_built_sources += $(moopython)/mooterm-pygtk.c
moopython_cleanfiles += $(moopython)/mooterm-pygtk.c
endif MOO_BUILD_TERM
if MOO_BUILD_EDIT
moopython_sources += $(moopython)/mooedit-mod.c
nodist_moopython_sources += $(moopython)/mooedit-pygtk.c
moopython_built_sources += $(moopython)/mooedit-pygtk.c
moopython_cleanfiles += $(moopython)/mooedit-pygtk.c
endif MOO_BUILD_EDIT
if MOO_BUILD_APP
moopython_sources += $(moopython)/mooapp-mod.c
nodist_moopython_sources += $(moopython)/mooapp-pygtk.c
moopython_built_sources += $(moopython)/mooapp-pygtk.c
moopython_cleanfiles += $(moopython)/mooapp-pygtk.c
endif MOO_BUILD_APP
$(moopython)/mooutils-pygtk.c: $(moopython)/mooutils-pygtk.defs $(moopython)/mooutils-pygtk.override
mkdir -p $(moopython)
pygtk-codegen-2.0 --prefix moo_utils \
--register $(PYGTK_DEFS_DIR)/gtk-types.defs \
--register $(PYGTK_DEFS_DIR)/gdk-types.defs \
--override $(moopython_srcdir)/mooutils-pygtk.override \
--outfilename mooutils-pygtk.c \
$(moopython_srcdir)/mooutils-pygtk.defs > $(moopython)/mooutils-pygtk.c
$(moopython)/mooterm-pygtk.c: $(moopython)/mooterm-pygtk.defs $(moopython)/mooterm-pygtk.override
mkdir -p $(moopython)
pygtk-codegen-2.0 --prefix moo_term \
--register $(PYGTK_DEFS_DIR)/gtk-types.defs \
--register $(PYGTK_DEFS_DIR)/gdk-types.defs \
--register $(moopython_srcdir)/mooutils-pygtk.defs \
--override $(moopython_srcdir)/mooterm-pygtk.override \
--outfilename mooterm-pygtk.c \
$(moopython_srcdir)/mooterm-pygtk.defs > $(moopython)/mooterm-pygtk.c
$(moopython)/mooedit-pygtk.c: $(moopython)/mooedit-pygtk.defs $(moopython)/mooedit-pygtk.override
mkdir -p $(moopython)
pygtk-codegen-2.0 --prefix moo_edit \
--register $(PYGTK_DEFS_DIR)/gtk-types.defs \
--register $(PYGTK_DEFS_DIR)/gdk-types.defs \
--register $(moopython_srcdir)/mooutils-pygtk.defs \
--override $(moopython_srcdir)/mooedit-pygtk.override \
--outfilename mooedit-pygtk.c \
$(moopython_srcdir)/mooedit-pygtk.defs > $(moopython)/mooedit-pygtk.c
$(moopython)/mooapp-pygtk.c: $(moopython)/mooapp-pygtk.defs $(moopython)/mooapp-pygtk.override
mkdir -p $(moopython)
pygtk-codegen-2.0 --prefix moo_app \
--register $(PYGTK_DEFS_DIR)/gtk-types.defs \
--register $(PYGTK_DEFS_DIR)/gdk-types.defs \
--register $(moopython_srcdir)/mooedit-pygtk.defs \
--register $(moopython_srcdir)/mooterm-pygtk.defs \
--register $(moopython_srcdir)/mooutils-pygtk.defs \
--override $(moopython_srcdir)/mooapp-pygtk.override \
--outfilename mooapp-pygtk.c \
$(moopython_srcdir)/mooapp-pygtk.defs > $(moopython)/mooapp-pygtk.c
if MOO_USE_PYTHON
moo_sources += $(moopython_sources)
moo_built_sources += $(moopython_bulit_sources)
moo_nodist_sources += $(nodist_moopython_sources)
moo_cleanfiles += $(moopython_cleanfiles)
endif
moo_extra_dist += $(moopython_extra_dist)

View File

@ -1,127 +0,0 @@
#
# mooterm/Makefile.am
#
SUBDIRS = glade
mooterminclude_headers = \
mooterm.h \
mootermwindow.h \
mooterm-text.h \
mootermline.h \
mootermtag.h
if MOO_STANDALONE
mootermincludedir = $(includedir)/moo-1.0/mooterm
mooterminclude_HEADERS = $(mooterminclude_headers)
endif MOO_STANDALONE
widget_sources = \
$(mooterminclude_headers) \
mooterm.c \
mooterm-input.c \
mooterm-keymap.h \
mooterm-prefs.c \
mooterm-prefs.h \
mooterm-private.h \
mooterm-selection.h \
mooterm-text.c \
mooterm-text-private.h \
mooterm-vt.h \
mooterm-vtctls.h \
mooterm-draw.c \
mootermbuffer.c \
mootermbuffer.h \
mootermbuffer-graph.h \
mootermbuffer-private.h \
mootermline.c \
mootermline-private.h \
mootermparser.c \
mootermparser.h \
mootermparser-yacc.c \
mootermparser-yacc.h \
mootermpt.c \
mootermpt.h \
mootermpt-private.h \
mootermtag.c \
mootermwindow.c \
mootermprefs-glade.h
widget_unix_sources = \
mootermpt-unix.c \
pty.c \
pty.h
widget_win32_sources = \
mootermhelper.h \
mootermpt-win32.c
termhelper_sources = \
mootermhelper.c \
mootermhelper.h \
pty.c \
pty.h
AM_INCLUDES =
common_cflags = \
-I$(top_builddir) \
-I$(top_builddir)/$(MOO_SRC_PREFIX) \
$(MOO_CFLAGS) \
$(GTK_CFLAGS)
AM_CFLAGS = $(common_cflags) $(MOO_DEBUG_CFLAGS) $(CFLAGS)
EXTRA_DIST = \
mootermparser-yacc.y \
$(widget_sources) \
$(widget_unix_sources) \
$(widget_win32_sources) \
$(termhelper_sources) \
termhelper_res.rc.in
noinst_LTLIBRARIES = libmooterm.la
libmooterm_la_SOURCES =
BUILT_SOURCES =
if MOO_OS_UNIX
libmooterm_la_SOURCES += $(widget_sources) $(widget_unix_sources) mootermprefs-glade.h
BUILT_SOURCES += mootermprefs-glade.h
endif MOO_OS_UNIX
if MOO_OS_MINGW
libmooterm_la_SOURCES += $(widget_sources) $(widget_win32_sources) mootermprefs-glade.h
BUILT_SOURCES += mootermprefs-glade.h
endif MOO_OS_MINGW
# XXX this should be removed too
mootermparser-yacc.c: mootermparser-yacc.y
bison -o $(srcdir)/mootermparser-yacc.c -d $(srcdir)/mootermparser-yacc.y
GLADE = $(srcdir)/glade
XML2H = $(srcdir)/../mooutils/xml2h.sh
mootermprefs-glade.h: $(GLADE)/mootermprefs.glade
sh $(XML2H) MOO_TERM_PREFS_GLADE_UI $(GLADE)/mootermprefs.glade \
> mootermprefs-glade.h
############################################################################
# CYGWIN
#
if MOO_OS_CYGWIN
noinst_PROGRAMS = termhelper
termhelper_CFLAGS = \
$(AM_CFLAGS) \
$(CYGWIN_CFLAGS)
termhelper_SOURCES = $(termhelper_sources)
termhelper_LDADD = $(CYGWIN_LDFLAGS) termhelper_res.res
termhelper_res.res: termhelper_res.rc
$(WINDRES) -i termhelper_res.rc --input-format=rc -o termhelper_res.res -O coff
endif MOO_OS_CYGWIN

98
moo/mooterm/Makefile.incl Normal file
View File

@ -0,0 +1,98 @@
#
# moo/mooterm/Makefile.incl
#
mooterm = $(moo_prefix)/mooterm
mooterm_srcdir = $(srcdir)/$(mooterm)
###########################################################################
# mooterm/glade
#
mooterm_glade = $(mooterm)/glade
moo_extra_dist += \
$(mooterm_glade)/mootermprefs.glade
###########################################################################
# mooterm
#
mooterminclude_headers = \
$(mooterm)/mooterm.h \
$(mooterm)/mootermwindow.h \
$(mooterm)/mooterm-text.h \
$(mooterm)/mootermline.h \
$(mooterm)/mootermtag.h
mooterm_sources = \
$(mooterminclude_headers) \
$(mooterm)/mooterm.c \
$(mooterm)/mooterm-input.c \
$(mooterm)/mooterm-keymap.h \
$(mooterm)/mooterm-prefs.c \
$(mooterm)/mooterm-prefs.h \
$(mooterm)/mooterm-private.h \
$(mooterm)/mooterm-selection.h \
$(mooterm)/mooterm-text.c \
$(mooterm)/mooterm-text-private.h \
$(mooterm)/mooterm-vt.h \
$(mooterm)/mooterm-vtctls.h \
$(mooterm)/mooterm-draw.c \
$(mooterm)/mootermbuffer.c \
$(mooterm)/mootermbuffer.h \
$(mooterm)/mootermbuffer-graph.h \
$(mooterm)/mootermbuffer-private.h \
$(mooterm)/mootermline.c \
$(mooterm)/mootermline-private.h \
$(mooterm)/mootermparser.c \
$(mooterm)/mootermparser.h \
$(mooterm)/mootermpt.c \
$(mooterm)/mootermpt.h \
$(mooterm)/mootermpt-private.h \
$(mooterm)/mootermtag.c \
$(mooterm)/mootermwindow.c \
$(mooterm)/mootermprefs-glade.h
mooterm_unix_sources = \
$(mooterm)/mootermpt-unix.c \
$(mooterm)/pty.c \
$(mooterm)/pty.h
mooterm_win32_sources = \
$(mooterm)/mootermhelper.h \
$(mooterm)/mootermpt-win32.c
termhelper_sources = \
$(mooterm)/mootermhelper.c \
$(mooterm)/mootermhelper.h \
$(mooterm)/pty.c \
$(mooterm)/pty.h
mooterm_extra_dist = \
$(mooterm)/mootermparser-yacc.y \
$(termhelper_sources) \
$(mooterm)/termhelper_res.rc.in
mooterm_built_sources = \
$(mooterm)/mootermprefs-glade.h \
$(mooterm)/mootermparser-yacc.c \
$(mooterm)/mootermparser-yacc.h
# XXX this should be removed too
$(mooterm_srcdir)/mootermparser-yacc.c: $(mooterm)/mootermparser-yacc.y
mkdir -p $(mooterm)
bison -o $(mooterm_srcdir)/mootermparser-yacc.c -d $(mooterm_srcdir)/mootermparser-yacc.y
$(mooterm)/mootermprefs-glade.h: $(mooterm)/glade/mootermprefs.glade
mkdir -p $(mooterm)
sh $(XML2H) MOO_TERM_PREFS_GLADE_UI $(mooterm_srcdir)/glade/mootermprefs.glade \
> $(mooterm)/mootermprefs-glade.h
moo_sources += $(mooterm_sources) $(mooterm_built_sources)
moo_unix_sources += $(mooterm_unix_sources)
moo_win32_sources += $(mooterm_win32_sources)
moo_built_sources += $(mooterm_built_sources)
moo_extra_dist += $(mooterm_extra_dist)

View File

@ -1,6 +0,0 @@
#
# mooterm/glade/Makefile.am
#
EXTRA_DIST = \
mootermprefs.glade

View File

@ -1,179 +0,0 @@
#
# mooutils/Makefile.am
#
DIST_SUBDIRS = newgtk glade pcre pixmaps moofileview xdgmime
if MOO_USE_XDGMIME
xdgmime = xdgmime
xdgmime_lib = xdgmime/libxdgmime.la
endif MOO_USE_XDGMIME
if !MOO_OS_MINGW
moofileview = moofileview
moofileview_lib = moofileview/libmoofileview.la
endif !MOO_OS_MINGW
DEFAULT_INCLUDES =
AM_CFLAGS = \
-I$(top_builddir) \
-I$(top_builddir)/$(MOO_SRC_PREFIX) \
$(MOO_CFLAGS) \
$(MOO_DEBUG_CFLAGS) \
$(CFLAGS) \
$(PYTHON_INCLUDES) \
$(PYGTK_CFLAGS)
SUBDIRS = pixmaps glade newgtk pcre $(moofileview) $(xdgmime) .
noinst_LTLIBRARIES = libmooutils.la
libmooutils_la_LIBADD = \
pcre/libpcre.la \
newgtk/libnewgtk.la \
$(moofileview_lib) \
$(xdgmime_lib)
utilsinclude_headers = \
eggregex.h \
mooaccelbutton.h \
moobigpaned.h \
moocellrenderercolor.h \
mooclosure.h \
moocombo.h \
mooentry.h \
moofiltermgr.h \
mooglade.h \
moohistoryentry.h \
moohistorylist.h \
moomarkup.h \
moomenumgr.h \
moonotebook.h \
moopaned.h \
mooprefs.h \
mooprefsdialog.h \
mooprefsdialogpage.h \
moostock.h \
mooutils-gobject.h \
mooaccel.h \
mooaction.h \
mooactiongroup.h \
moomenuaction.h \
mootoggleaction.h \
moouixml.h \
mooutils-misc.h \
moowindow.h \
mooutils-python.h
if MOO_STANDALONE
utilsincludedir = $(includedir)/moo-1.0/mooutils
utilsinclude_HEADERS = $(utilsinclude_headers)
endif MOO_STANDALONE
libmooutils_la_SOURCES = \
$(utilsinclude_headers) \
eggregex.c \
mooaccelbutton.c \
mooaccelbutton-glade.h \
moobigpaned.c \
moocellrenderercolor.c \
mooclosure.c \
moocombo.c \
moocompat.c \
moocompat.h \
moodialogs.c \
moodialogs.h \
mooentry.c \
moofilewatch.c \
moofilewatch.h \
moofiltermgr.c \
mooglade.c \
moohistoryentry.c \
moohistorylist.c \
moomarkup.c \
moomenumgr.c \
moonotebook.c \
moopaned.c \
mooprefs.c \
mooprefsdialog.c \
mooprefsdialogpage.c \
moostock.c \
mooutils-gobject.c \
mooutils-misc.c \
mooaccel.c \
mooaccelprefs-glade.h \
mooaction.c \
mooactiongroup.c \
moomenuaction.c \
mootoggleaction.c \
moouixml.c \
moowindow.c \
gtksourceundomanager.c \
gtksourceundomanager.h \
stock-about-16.h \
stock-about-24.h \
stock-moo.h \
stock-edit-16.h \
stock-edit-24.h \
stock-select-all-16.h \
stock-select-all-24.h \
stock-terminal-24.h
python_sources = \
mooutils-python.c \
mooutils-python.h
if MOO_USE_PYTHON
libmooutils_la_SOURCES += $(python_sources)
endif
nodist_libmooutils_la_SOURCES = \
moomarshals.c \
moomarshals.h
CLEANFILES = $(nodist_libmooutils_la_SOURCES)
EXTRA_DIST = \
$(python_sources) \
moomarshals.list \
xml2h.sh
BUILT_SOURCES = \
mooaccelbutton-glade.h \
mooaccelprefs-glade.h \
moomarshals.h \
moomarshals.c \
stock-moo.h
moomarshals.c: moomarshals.list
glib-genmarshal --prefix=_moo_marshal --body \
$(srcdir)/moomarshals.list > moomarshals.c
moomarshals.h: moomarshals.list
glib-genmarshal --prefix=_moo_marshal --header \
$(srcdir)/moomarshals.list > moomarshals.h
mooaccelbutton-glade.h: $(srcdir)/glade/shortcutdialog.glade $(srcdir)/xml2h.sh
sh $(srcdir)/xml2h.sh MOO_ACCEL_BUTTON_GLADE_UI \
$(srcdir)/glade/shortcutdialog.glade > mooaccelbutton-glade.h
mooaccelprefs-glade.h: $(srcdir)/glade/shortcutsprefs.glade $(srcdir)/../mooutils/xml2h.sh
sh $(srcdir)/xml2h.sh MOO_SHORTCUTS_PREFS_GLADE_UI \
$(srcdir)/glade/shortcutsprefs.glade > mooaccelprefs-glade.h
PIXMAPS = \
$(srcdir)/pixmaps/gap.png \
$(srcdir)/pixmaps/ggap.png \
$(srcdir)/pixmaps/close.png \
$(srcdir)/pixmaps/detach.png \
$(srcdir)/pixmaps/attach.png \
$(srcdir)/pixmaps/keepontop.png \
$(srcdir)/pixmaps/sticky.png
stock-moo.h: $(PIXMAPS)
gdk-pixbuf-csource --static --build-list \
GAP_ICON $(srcdir)/pixmaps/gap.png \
GGAP_ICON $(srcdir)/pixmaps/ggap.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 \
> $(srcdir)/stock-moo.h

315
moo/mooutils/Makefile.incl Normal file
View File

@ -0,0 +1,315 @@
#
# moo/mooutils/Makefile.incl
#
mooutils_prefix = $(moo_prefix)/mooutils
###########################################################################
# mooutils/glade
#
mooutils_glade = $(mooutils_prefix)/glade
moo_extra_dist += \
$(mooutils_glade)/shortcutdialog.glade \
$(mooutils_glade)/shortcutsprefs.glade \
$(mooutils_glade)/toolbar.sh \
$(mooutils_glade)/support.sh
###########################################################################
# mooutils/moofileview
#
moofileview = $(mooutils_prefix)/moofileview
moofileview_srcdir = $(srcdir)/$(moofileview)
moofileview_sources = \
$(moofileview)/moobookmarkmgr.c \
$(moofileview)/moobookmarkmgr.h \
$(moofileview)/moobookmarkmgr-glade.h \
$(moofileview)/moofile.c \
$(moofileview)/moofile.h \
$(moofileview)/moofileentry.c \
$(moofileview)/moofileentry.h \
$(moofileview)/moofilesystem.c \
$(moofileview)/moofilesystem.h \
$(moofileview)/moofileview.c \
$(moofileview)/moofileview.h \
$(moofileview)/moofileview-dialogs.c \
$(moofileview)/moofileview-dialogs.h \
$(moofileview)/moofileview-private.h \
$(moofileview)/moofoldermodel.c \
$(moofileview)/moofoldermodel.h \
$(moofileview)/moofoldermodel-private.h \
$(moofileview)/mooiconview.c \
$(moofileview)/mooiconview.h \
$(moofileview)/symlink.h
moofileview_pixmaps = \
$(moofileview)/symlink.png \
$(moofileview)/symlink-small.png
moofileview_built_sources = \
$(moofileview)/symlink.h \
$(moofileview)/moobookmarkmgr-glade.h
$(moofileview)/symlink.h: $(moofileview_pixmaps)
mkdir -p $(moofileview)
gdk-pixbuf-csource --static --build-list \
SYMLINK_ARROW $(moofileview_srcdir)/symlink.png \
SYMLINK_ARROW_SMALL $(moofileview_srcdir)/symlink-small.png \
> $(moofileview)/symlink.h
$(moofileview)/moobookmarkmgr-glade.h: $(moofileview_srcdir)/glade/bookmark_editor.glade $(XML2H)
mkdir -p $(moofileview)
sh $(XML2H) MOO_BOOKMARK_MGR_GLADE_UI \
$(moofileview_srcdir)/glade/bookmark_editor.glade > \
$(moofileview)/moobookmarkmgr-glade.h
moo_extra_dist += \
$(moofileview)/glade/bookmark_editor.glade \
$(moofileview_pixmaps)
moo_unix_sources += \
$(moofileview_sources)
moo_built_sources += \
$(moofileview_built_sources)
###########################################################################
# mooutils/newgtk
#
moonewgtk = $(mooutils_prefix)/newgtk
moonewgtk_sources =
moonewgtk_glib_2_8_sources = \
$(moonewgtk)/gmappedfile.c \
$(moonewgtk)/gmappedfile.h
moonewgtk_gtk_2_4_sources = \
$(moonewgtk)/gtkcolorbutton.c \
$(moonewgtk)/gtkcolorbutton.h \
$(moonewgtk)/gtkfontbutton.c \
$(moonewgtk)/gtkfontbutton.h
if !GLIB_2_8
moonewgtk_sources += $(moonewgtk_glib_2_8_sources)
endif !GLIB_2_8
if !GTK_2_4
moonewgtk_sources += $(moonewgtk_gtk_2_4_sources)
endif
moo_sources += $(moonewgtk_sources)
moo_extra_dist += \
$(moonewgtk_glib_2_8_sources) \
$(moonewgtk_gtk_2_4_sources)
###########################################################################
# mooutils/pcre
#
moopcre = $(mooutils_prefix)/pcre
moopcre_sources = \
$(moopcre)/get.c \
$(moopcre)/internal.h \
$(moopcre)/pcre-config.h \
$(moopcre)/maketables.c \
$(moopcre)/pcre.c \
$(moopcre)/pcre.h \
$(moopcre)/study.c
moo_sources += $(moopcre_sources)
moo_extra_dist += $(moopcre)/chartables.c
###########################################################################
# mooutils/pixmaps
#
moopixmaps = $(mooutils_prefix)/pixmaps
moo_extra_dist += \
$(moopixmaps)/ggap.png \
$(moopixmaps)/ggap.ico \
$(moopixmaps)/gap.png \
$(moopixmaps)/close.png \
$(moopixmaps)/sticky.png \
$(moopixmaps)/detach.png \
$(moopixmaps)/attach.png \
$(moopixmaps)/keepontop.png
###########################################################################
# mooutils/xdgmime
#
mooxdgmime = $(mooutils_prefix)/xdgmime
mooxdgmime_sources = \
$(mooxdgmime)/xdgmimealias.c \
$(mooxdgmime)/xdgmimealias.h \
$(mooxdgmime)/xdgmime.c \
$(mooxdgmime)/xdgmimecache.c \
$(mooxdgmime)/xdgmimecache.h \
$(mooxdgmime)/xdgmimeglob.c \
$(mooxdgmime)/xdgmimeglob.h \
$(mooxdgmime)/xdgmime.h \
$(mooxdgmime)/xdgmimeint.c \
$(mooxdgmime)/xdgmimeint.h \
$(mooxdgmime)/xdgmimemagic.c \
$(mooxdgmime)/xdgmimemagic.h \
$(mooxdgmime)/xdgmimeparent.c \
$(mooxdgmime)/xdgmimeparent.h
moo_unix_sources += $(mooxdgmime_sources)
###########################################################################
# mooutils
#
mooutils = $(mooutils_prefix)
mooutils_srcdir = $(srcdir)/$(mooutils)
mooutils_include_headers = \
$(mooutils)/eggregex.h \
$(mooutils)/mooaccelbutton.h \
$(mooutils)/moobigpaned.h \
$(mooutils)/moocellrenderercolor.h \
$(mooutils)/mooclosure.h \
$(mooutils)/moocombo.h \
$(mooutils)/mooentry.h \
$(mooutils)/moofiltermgr.h \
$(mooutils)/mooglade.h \
$(mooutils)/moohistoryentry.h \
$(mooutils)/moohistorylist.h \
$(mooutils)/moomarkup.h \
$(mooutils)/moomenumgr.h \
$(mooutils)/moonotebook.h \
$(mooutils)/moopaned.h \
$(mooutils)/mooprefs.h \
$(mooutils)/mooprefsdialog.h \
$(mooutils)/mooprefsdialogpage.h \
$(mooutils)/moostock.h \
$(mooutils)/mooutils-gobject.h \
$(mooutils)/mooaccel.h \
$(mooutils)/mooaction.h \
$(mooutils)/mooactiongroup.h \
$(mooutils)/moomenuaction.h \
$(mooutils)/mootoggleaction.h \
$(mooutils)/moouixml.h \
$(mooutils)/mooutils-misc.h \
$(mooutils)/moowindow.h \
$(mooutils)/mooutils-python.h
mooutils_sources = \
$(mooutils_include_headers) \
$(mooutils)/eggregex.c \
$(mooutils)/mooaccelbutton.c \
$(mooutils)/mooaccelbutton-glade.h \
$(mooutils)/moobigpaned.c \
$(mooutils)/moocellrenderercolor.c \
$(mooutils)/mooclosure.c \
$(mooutils)/moocombo.c \
$(mooutils)/moocompat.c \
$(mooutils)/moocompat.h \
$(mooutils)/moodialogs.c \
$(mooutils)/moodialogs.h \
$(mooutils)/mooentry.c \
$(mooutils)/moofilewatch.c \
$(mooutils)/moofilewatch.h \
$(mooutils)/moofiltermgr.c \
$(mooutils)/mooglade.c \
$(mooutils)/moohistoryentry.c \
$(mooutils)/moohistorylist.c \
$(mooutils)/moomarkup.c \
$(mooutils)/moomenumgr.c \
$(mooutils)/moonotebook.c \
$(mooutils)/moopaned.c \
$(mooutils)/mooprefs.c \
$(mooutils)/mooprefsdialog.c \
$(mooutils)/mooprefsdialogpage.c \
$(mooutils)/moostock.c \
$(mooutils)/mooutils-gobject.c \
$(mooutils)/mooutils-misc.c \
$(mooutils)/mooaccel.c \
$(mooutils)/mooaccelprefs-glade.h \
$(mooutils)/mooaction.c \
$(mooutils)/mooactiongroup.c \
$(mooutils)/moomenuaction.c \
$(mooutils)/mootoggleaction.c \
$(mooutils)/moouixml.c \
$(mooutils)/moowindow.c \
$(mooutils)/gtksourceundomanager.c \
$(mooutils)/gtksourceundomanager.h \
$(mooutils)/stock-about-16.h \
$(mooutils)/stock-about-24.h \
$(mooutils)/stock-moo.h \
$(mooutils)/stock-edit-16.h \
$(mooutils)/stock-edit-24.h \
$(mooutils)/stock-select-all-16.h \
$(mooutils)/stock-select-all-24.h \
$(mooutils)/stock-terminal-24.h
mooutils_python_sources = \
$(mooutils)/mooutils-python.c \
$(mooutils)/mooutils-python.h
if MOO_USE_PYTHON
mooutils_sources += $(mooutils_python_sources)
endif
nodist_mooutils_sources = \
$(mooutils)/moomarshals.c \
$(mooutils)/moomarshals.h
mooutils_extra_dist = \
$(mooutils_python_sources) \
$(mooutils)/moomarshals.list \
$(mooutils)/xml2h.sh
mooutils_built_sources = \
$(mooutils)/moomarshals.c \
$(mooutils)/moomarshals.h \
$(mooutils)/mooaccelbutton-glade.h \
$(mooutils)/mooaccelprefs-glade.h \
$(mooutils)/stock-moo.h
$(mooutils)/moomarshals.c: $(mooutils)/moomarshals.list
glib-genmarshal --prefix=_moo_marshal --body \
$(mooutils_srcdir)/moomarshals.list > $(mooutils)/moomarshals.c
$(mooutils)/moomarshals.h: $(mooutils)/moomarshals.list
glib-genmarshal --prefix=_moo_marshal --header \
$(mooutils_srcdir)/moomarshals.list > $(mooutils)/moomarshals.h
$(mooutils)/mooaccelbutton-glade.h: $(mooutils_srcdir)/glade/shortcutdialog.glade
sh $(mooutils_srcdir)/xml2h.sh MOO_ACCEL_BUTTON_GLADE_UI \
$(mooutils_srcdir)/glade/shortcutdialog.glade > $(mooutils)/mooaccelbutton-glade.h
$(mooutils)/mooaccelprefs-glade.h: $(mooutils_srcdir)/glade/shortcutsprefs.glade
sh $(mooutils_srcdir)/xml2h.sh MOO_SHORTCUTS_PREFS_GLADE_UI \
$(mooutils_srcdir)/glade/shortcutsprefs.glade > $(mooutils)/mooaccelprefs-glade.h
mooutils_pixmaps = \
$(mooutils_srcdir)/pixmaps/gap.png \
$(mooutils_srcdir)/pixmaps/ggap.png \
$(mooutils_srcdir)/pixmaps/close.png \
$(mooutils_srcdir)/pixmaps/detach.png \
$(mooutils_srcdir)/pixmaps/attach.png \
$(mooutils_srcdir)/pixmaps/keepontop.png \
$(mooutils_srcdir)/pixmaps/sticky.png
$(mooutils)/stock-moo.h: $(mooutils_pixmaps)
gdk-pixbuf-csource --static --build-list \
GAP_ICON $(mooutils_srcdir)/pixmaps/gap.png \
GGAP_ICON $(mooutils_srcdir)/pixmaps/ggap.png \
MOO_CLOSE_ICON $(mooutils_srcdir)/pixmaps/close.png \
MOO_STICKY_ICON $(mooutils_srcdir)/pixmaps/sticky.png \
MOO_DETACH_ICON $(mooutils_srcdir)/pixmaps/detach.png \
MOO_ATTACH_ICON $(mooutils_srcdir)/pixmaps/attach.png \
MOO_KEEP_ON_TOP_ICON $(mooutils_srcdir)/pixmaps/keepontop.png \
> $(mooutils)/stock-moo.h
moo_sources += $(mooutils_sources)
moo_built_sources += $(mooutils_built_sources)
moo_nodist_sources += $(nodist_mooutils_sources)
moo_extra_dist += $(mooutils_extra_dist)

View File

@ -1,10 +0,0 @@
#
# mooutils/glade/Makefile.am
#
EXTRA_DIST = \
shortcutdialog.glade \
shortcutsprefs.glade \
toolbar.sh \
support.sh \
toolbar.sh

View File

@ -1,49 +0,0 @@
SUBDIRS = glade
noinst_LTLIBRARIES = libmoofileview.la
pixmaps = symlink.png symlink-small.png
EXTRA_DIST = $(pixmaps)
BUILT_SOURCES = symlink.h moobookmarkmgr-glade.h
symlink.h: $(pixmaps)
gdk-pixbuf-csource --static --build-list \
SYMLINK_ARROW $(srcdir)/symlink.png \
SYMLINK_ARROW_SMALL $(srcdir)/symlink-small.png \
> symlink.h
moobookmarkmgr-glade.h: $(srcdir)/glade/bookmark_editor.glade $(srcdir)/../xml2h.sh
sh $(srcdir)/../xml2h.sh MOO_BOOKMARK_MGR_GLADE_UI \
$(srcdir)/glade/bookmark_editor.glade > moobookmarkmgr-glade.h
real_src_dir = `cd $(srcdir) && pwd`
AM_CFLAGS = \
$(GTHREAD_CFLAGS) \
-I$(top_builddir) \
-I$(top_builddir)/$(MOO_SRC_PREFIX) \
$(MOO_CFLAGS) \
$(MOO_DEBUG_CFLAGS) \
$(CFLAGS)
libmoofileview_la_SOURCES = \
moobookmarkmgr.c \
moobookmarkmgr.h \
moobookmarkmgr-glade.h \
moofile.c \
moofile.h \
moofileentry.c \
moofileentry.h \
moofilesystem.c \
moofilesystem.h \
moofileview.c \
moofileview.h \
moofileview-dialogs.c \
moofileview-dialogs.h \
moofileview-private.h \
moofoldermodel.c \
moofoldermodel.h \
moofoldermodel-private.h \
mooiconview.c \
mooiconview.h \
symlink.h

View File

@ -1 +0,0 @@
EXTRA_DIST = bookmark_editor.glade

View File

@ -11,17 +11,17 @@
* See COPYING file that comes with this distribution.
*/
#include "moobookmarkmgr.h"
#include "moobookmarkmgr-glade.h"
#include "moofileentry.h"
#include "mooutils/moofileview/moobookmarkmgr.h"
#include "mooutils/moofileview/moobookmarkmgr-glade.h"
#include "mooutils/moofileview/moofileentry.h"
#include "mooutils/mooglade.h"
#include "mooutils/mooprefs.h"
#include MOO_MARSHALS_H
#include <string.h>
#include <errno.h>
#include <unistd.h>
#include <glib/gstdio.h>
#include <gtk/gtk.h>
#include "mooutils/mooglade.h"
#include "mooutils/mooprefs.h"
#define COLUMN_BOOKMARK MOO_BOOKMARK_MGR_COLUMN_BOOKMARK

View File

@ -22,9 +22,9 @@
*/
#define MOO_FILE_SYSTEM_COMPILATION
#include "moofilesystem.h"
#include "mooutils/moofileview/moofilesystem.h"
#include "mooutils/moofileview/symlink.h"
#include MOO_MARSHALS_H
#include "symlink.h"
#include <string.h>
#include <sys/types.h>
#include <sys/stat.h>

View File

@ -290,7 +290,8 @@ moo_file_watch_method_get_type (void)
static const GEnumValue values[] = {
{MOO_FILE_WATCH_STAT, (char*) "MOO_FILE_WATCH_STAT", (char*) "stat"},
{MOO_FILE_WATCH_FAM, (char*) "MOO_FILE_WATCH_FAM", (char*) "fam"},
{MOO_FILE_WATCH_WIN32, (char*) "MOO_FILE_WATCH_WIN32", (char*) "win32"}
{MOO_FILE_WATCH_WIN32, (char*) "MOO_FILE_WATCH_WIN32", (char*) "win32"},
{ 0, NULL, NULL }
};
type = g_enum_register_static ("MooFileWatchMethod", values);
@ -312,6 +313,7 @@ moo_file_watch_event_code_get_type (void)
{MOO_FILE_WATCH_DELETED, (char*) "MOO_FILE_WATCH_DELETED", (char*) "deleted"},
{MOO_FILE_WATCH_CREATED, (char*) "MOO_FILE_WATCH_CREATED", (char*) "created"},
{MOO_FILE_WATCH_MOVED, (char*) "MOO_FILE_WATCH_MOVED", (char*) "moved"},
{ 0, NULL, NULL }
};
type = g_enum_register_static ("MooFileWatchEventCode", values);

View File

@ -1,39 +0,0 @@
#
# mooutils/newgtk/Makefile.am
#
DEFAULT_INCLUDES =
AM_CFLAGS = \
-I$(top_builddir) \
-I$(top_srcdir)/$(MOO_SRC_PREFIX) \
-I$(top_builddir)/$(MOO_SRC_PREFIX) \
$(MOO_DEBUG_CFLAGS) \
$(CFLAGS) \
$(XML_CFLAGS) \
$(GTK_CFLAGS) \
-DG_LOG_DOMAIN=\"Gtk\"
noinst_LTLIBRARIES = libnewgtk.la
libnewgtk_la_SOURCES = newgtk-dummy.c
glib_2_8_sources = \
gmappedfile.c \
gmappedfile.h
gtk_2_4_sources = \
gtkcolorbutton.c \
gtkcolorbutton.h \
gtkfontbutton.c \
gtkfontbutton.h
EXTRA_DIST = \
$(glib_2_8_sources) \
$(gtk_2_4_sources)
if !GLIB_2_8
libnewgtk_la_SOURCES += $(glib_2_8_sources)
endif !GLIB_2_8
if !GTK_2_4
libnewgtk_la_SOURCES += $(gtk_2_4_sources)
endif

View File

@ -1 +0,0 @@
/* blank file to make libtool and automake happy */

View File

@ -1,20 +0,0 @@
noinst_LTLIBRARIES = libpcre.la
AM_CFLAGS = \
-I$(top_builddir) \
-I$(top_builddir)/$(MOO_SRC_PREFIX) \
-I$(srcdir) \
$(PYTHON_INCLUDES) \
$(PYGTK_CFLAGS) \
$(MOO_CFLAGS) \
$(CFLAGS)
libpcre_la_SOURCES = \
get.c \
internal.h \
pcre-config.h \
maketables.c \
chartables.c \
pcre.c \
pcre.h \
study.c

View File

@ -1,12 +0,0 @@
#
# mooutils/pixmaps/Makefile.am
#
EXTRA_DIST = \
ggap.png \
gap.png \
close.png \
sticky.png \
detach.png \
attach.png \
keepontop.png

View File

@ -1,32 +0,0 @@
#
# mooedit/xdgmime/Makefile.am
#
DEFAULT_INCLUDES =
AM_CFLAGS = \
-I$(top_builddir) \
-Wall \
-DXDG_PREFIX=_moo_edit_xdg
noinst_LTLIBRARIES = libxdgmime.la
libxdgmime_la_SOURCES = \
xdgmimealias.c \
xdgmimealias.h \
xdgmime.c \
xdgmimecache.c \
xdgmimecache.h \
xdgmimeglob.c \
xdgmimeglob.h \
xdgmime.h \
xdgmimeint.c \
xdgmimeint.h \
xdgmimemagic.c \
xdgmimemagic.h \
xdgmimeparent.c \
xdgmimeparent.h
noinst_PROGRAMS = test-mime
test_mime_LDADD = libxdgmime.la
test_mime_SOURCES = test-mime.c

View File

@ -41,7 +41,7 @@ AM_CFLAGS = \
ldflags = -export-dynamic
ldadd = \
../moo/libmoo-1.0.la \
../libmoo-1.0.la \
$(MOO_LIBS) \
$(PYTHON_LDFLAGS) \
$(PYTHON_EXTRA_LIBS)