nyje
/
medit
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Build system cleanup

master
Yevgen Muntyan 2008-05-22 22:40:19 -05:00
parent c1b11b9bb2
commit 5207d4fad7
47 changed files with 354 additions and 891 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Makefile.am
View File

@ -1,4 +1,4 @@
AUTOMAKE_OPTIONS = dist-bzip2 no-dist-gzip foreign nostdinc
AUTOMAKE_OPTIONS = dist-bzip2 no-dist-gzip
EXTRA_DIST = \
autogen.sh \
@ -37,6 +37,20 @@ SUBDIRS += tests
endif
endif
moo-config-dirs.h: moo-config-dirs.h.stamp
moo-config-dirs.h.stamp: Makefile
{ echo '#define MOO_DATA_DIR "$(MOO_DATA_DIR)"'; \
echo '#define MOO_LIB_DIR "$(MOO_LIB_DIR)"'; \
echo '#define MOO_LOCALE_DIR "$(MOO_LOCALE_DIR)"'; \
echo '#define MOO_HELP_DIR "$(MOO_HELP_DIR)"'; \
} | sed '/""/d' > moo-config-dirs.h.tmp || exit 1
cmp -s moo-config-dirs.h moo-config-dirs.h.tmp || \
mv moo-config-dirs.h.tmp moo-config-dirs.h || exit 1
rm -f moo-config-dirs.h.tmp
echo stamp > moo-config-dirs.h.stamp
BUILT_SOURCES += moo-config-dirs.h.stamp
CLEANFILES = moo-config-dirs.h.stamp moo-config-dirs.h
ACLOCAL_AMFLAGS = -I m4
DISTCLEANFILES = \

4
autogen.sh
View File

@ -54,8 +54,8 @@ $ACLOCAL $ACLOCAL_FLAGS || exit $?
echo $AUTOHEADER
$AUTOHEADER || exit $?
echo $AUTOMAKE --add-missing --foreign --copy
$AUTOMAKE --add-missing --foreign --copy || exit $?
echo $AUTOMAKE --add-missing --copy
$AUTOMAKE --add-missing --copy || exit $?
echo $AUTOCONF
$AUTOCONF || exit $?

288
config.h.win32
View File

@ -1,288 +0,0 @@
/* config.h. Generated by configure. */
/* config.h.in. Generated from configure.ac by autoheader. */
/* If you are compiling for a system that uses EBCDIC instead of ASCII dnl
character codes, define this macro as 1. */
#define EBCDIC 0
/* Define to 1 if `TIOCGWINSZ' requires <sys/ioctl.h>. */
/* #undef GWINSZ_IN_SYS_IOCTL */
/* Define to 1 if you have the `bcopy' function. */
/* #undef HAVE_BCOPY */
/* Define to 1 if you have the `cfmakeraw' function. */
/* #undef HAVE_CFMAKERAW */
/* Define to 1 if you have the <errno.h> header file. */
#define HAVE_ERRNO_H 1
/* Define to 1 if you have the <fcntl.h> header file. */
#define HAVE_FCNTL_H 1
/* Define to 1 if you have the `getpgid' function. */
/* #undef HAVE_GETPGID */
/* Define to 1 if you have the `getpt' function. */
/* #undef HAVE_GETPT */
/* Define to 1 if you have the `grantpt' function. */
/* #undef HAVE_GRANTPT */
/* Define to 1 if you have the <inttypes.h> header file. */
#define HAVE_INTTYPES_H 1
/* Define to 1 if you have the <io.h> header file. */
#define HAVE_IO_H 1
/* Define to 1 if you have the `kill' function. */
/* #undef HAVE_KILL */
/* Define to 1 if you have the <limits.h> header file. */
#define HAVE_LIMITS_H 1
/* Define to 1 if the system has the type `long long'. */
#define HAVE_LONG_LONG 1
/* Define to 1 if you have the `memmove' function. */
#define HAVE_MEMMOVE 1
/* Define to 1 if you have the <memory.h> header file. */
#define HAVE_MEMORY_H 1
/* Define to 1 if you have the `mmap' function. */
/* #undef HAVE_MMAP */
/* Define to 1 if you have the `pipe' function. */
/* #undef HAVE_PIPE */
/* Define to 1 if you have the `poll' function. */
/* #undef HAVE_POLL */
/* Define to 1 if you have the <poll.h> header file. */
/* #undef HAVE_POLL_H */
/* Define to 1 if you have the `posix_openpt' function. */
/* #undef HAVE_POSIX_OPENPT */
/* Define to 1 if you have the `ptsname' function. */
/* #undef HAVE_PTSNAME */
/* Define to 1 if you have the `ptsname_r' function. */
/* #undef HAVE_PTSNAME_R */
/* Define to 1 if you have the `recvmsg' function. */
/* #undef HAVE_RECVMSG */
/* Define to 1 if you have the `signal' function. */
#define HAVE_SIGNAL 1
/* Define to 1 if you have the <signal.h> header file. */
#define HAVE_SIGNAL_H 1
/* Define to 1 if you have the <stdint.h> header file. */
#define HAVE_STDINT_H 1
/* Define to 1 if you have the <stdlib.h> header file. */
#define HAVE_STDLIB_H 1
/* Define to 1 if you have the `strerror' function. */
#define HAVE_STRERROR 1
/* Define to 1 if you have the <strings.h> header file. */
#define HAVE_STRINGS_H 1
/* Define to 1 if you have the <string.h> header file. */
#define HAVE_STRING_H 1
/* Define to 1 if you have the <stropts.h> header file. */
/* #undef HAVE_STROPTS_H */
/* Define to 1 if you have the `strtoll' function. */
#define HAVE_STRTOLL 1
/* Define to 1 if you have the `strtoq' function. */
/* #undef HAVE_STRTOQ */
/* Define to 1 if you have the <sys/select.h> header file. */
/* #undef HAVE_SYS_SELECT_H */
/* Define to 1 if you have the <sys/stat.h> header file. */
#define HAVE_SYS_STAT_H 1
/* Define to 1 if you have the <sys/termios.h> header file. */
/* #undef HAVE_SYS_TERMIOS_H */
/* Define to 1 if you have the <sys/types.h> header file. */
#define HAVE_SYS_TYPES_H 1
/* Define to 1 if you have the <sys/un.h> header file. */
/* #undef HAVE_SYS_UN_H */
/* Define to 1 if you have the <sys/utsname.h> header file. */
/* #undef HAVE_SYS_UTSNAME_H */
/* Define to 1 if you have the <sys/wait.h> header file. */
/* #undef HAVE_SYS_WAIT_H */
/* Define to 1 if you have the <termios.h> header file. */
/* #undef HAVE_TERMIOS_H */
/* Define to 1 if you have the <unistd.h> header file. */
#define HAVE_UNISTD_H 1
/* Define to 1 if you have the `unlink' function. */
#define HAVE_UNLINK 1
/* Define to 1 if you have the `unlockpt' function. */
/* #undef HAVE_UNLOCKPT */
/* Define to 1 if the system has the type `unsigned long long'. */
#define HAVE_UNSIGNED_LONG_LONG 1
/* Define to 1 if you have the <wchar.h> header file. */
#define HAVE_WCHAR_H 1
/* Define if xmlNode structure has 'line' member */
#define HAVE_XMLNODE_LINE 1
/* Define to 1 if you have the `xmlParseFile' function. */
/* #undef HAVE_XMLPARSEFILE */
/* Define to 1 if you have the `xmlReadFile' function. */
/* #undef HAVE_XMLREADFILE */
/* Define to 1 if you have the `_pipe' function. */
#define HAVE__PIPE 1
/* The value of LINK_SIZE determines the number of bytes used to store dnl
links as offsets within the compiled regex. The default is 2, which allows
for dnl compiled patterns up to 64K long. This covers the vast majority of
cases. dnl However, PCRE can also be compiled to use 3 or 4 bytes instead.
This allows for dnl longer patterns in extreme cases. */
#define LINK_SIZE 2
/* The value of MATCH_LIMIT determines the default number of times the match()
dnl function can be called during a single execution of pcre_exec(). (There
is a dnl runtime method of setting a different limit.) The limit exists in
order to dnl catch runaway regular expressions that take for ever to
determine that they do dnl not match. The default is set very large so that
it does not accidentally catch dnl legitimate cases. */
#define MATCH_LIMIT 10000000
/* build mooapp */
#define MOO_BUILD_APP
/* build mooedit */
#define MOO_BUILD_EDIT
/* MOO_BUILD_PCRE - bulid pcre library */
#define MOO_BUILD_PCRE
/* build mooterm */
/* #undef MOO_BUILD_TERM */
/* build mooutils */
#define MOO_BUILD_UTILS
/* enable printing */
/* #undef MOO_ENABLE_PRINTING */
/* enable relocation */
#define MOO_ENABLE_RELOCATION 1
/* bsd */
/* #undef MOO_OS_BSD */
/* cygwin */
/* #undef MOO_OS_CYGWIN */
/* darwin */
/* #undef MOO_OS_DARWIN */
/* mingw */
#define MOO_OS_MINGW 1
/* unix */
/* #undef MOO_OS_UNIX */
/* package name */
#define MOO_PACKAGE_NAME "moo"
/* MOO_USE_PYTHON */
/* #undef MOO_USE_PYTHON */
/* use xdgmime */
/* #undef MOO_USE_XDGMIME */
/* use libxml */
#define MOO_USE_XML 1
/* "libmoo version" */
#define MOO_VERSION "0.6.999"
/* "libmoo major version" */
#define MOO_MAJOR_VERSION 0
/* "libmoo micro version" */
#define MOO_MICRO_VERSION 2
/* "libmoo minor version" */
#define MOO_MINOR_VERSION 8
/* The value of NEWLINE determines the newline character */
#define NEWLINE '\n'
/* Name of package */
#define PACKAGE "medit"
/* Define to the address where bug reports for this package should be sent. */
#define PACKAGE_BUGREPORT "muntyan@math.tamu.edu"
/* Define to the full name of this package. */
#define PACKAGE_NAME "medit"
/* Define to the full name and version of this package. */
#define PACKAGE_STRING "medit 0.6.999"
/* Define to the one symbol short name of this package. */
#define PACKAGE_TARNAME "medit"
/* Define to the version of this package. */
#define PACKAGE_VERSION "0.6.999"
/* pcre library release date */
#define PCRE_DATE $PCRE_DATE
/* PCRE_EXPORT - empty since we do not need pcre api be exported */
#define PCRE_EXPORT
/* pcre library major version */
#define PCRE_MAJOR $PCRE_MAJOR
/* pcre library minor version */
#define PCRE_MINOR $PCRE_MINOR
/* POSIX_MALLOC_THRESHOLD */
#define POSIX_MALLOC_THRESHOLD 10
/* Define to 1 if you have the ANSI C header files. */
#define STDC_HEADERS 1
/* SUPPORT_UCP */
#define SUPPORT_UCP
/* SUPPORT_UTF8 */
#define SUPPORT_UTF8
/* Version number of package */
#define VERSION "0.6.999"
/* Define to empty if `const' does not conform to ANSI C. */
/* #undef const */
/* Define to `int' if <sys/types.h> does not define. */
/* #undef pid_t */
/* Define to `unsigned' if <sys/types.h> does not define. */
/* #undef size_t */

10
configure.ac
View File

@ -3,13 +3,14 @@
#
AC_INIT([medit],[0.9.4],[muntyan@tamu.edu],[medit])
AM_INIT_AUTOMAKE
AM_INIT_AUTOMAKE([foreign std-options])
AC_CANONICAL_HOST
AC_CONFIG_HEADERS(config.h)
MOO_DEFINE_VERSIONS(moo, AC_PACKAGE_VERSION)
MOO_DEFINE_MODULE_VERSIONS(1,0)
MOO_AC_SRCDIR(moo)
MOO_AC_I18N(moo)
MOO_AC_PO_GSV
@ -20,15 +21,12 @@ AC_LIBTOOL_WIN32_DLL
AC_PROG_LIBTOOL
AC_PROG_INSTALL
MOO_AC_PROGS
ACLOCAL="$ACLOCAL $ACLOCAL_FLAGS"
MOO_SRC_PREFIX="moo"
AC_SUBST(MOO_SRC_PREFIX)
MOO_COMPONENTS([ui,edit,term],[])
MOO_AC_SET_DIRS
MOO_AC_FLAGS(moo)
MOO_AC_PRIV_FLAGS
MOO_AM_MK
################################################################################

130
m4/moo-flags.m4
View File

@ -7,101 +7,113 @@ cmp -s configargs.h configargs.h.tmp || mv configargs.h.tmp configargs.h
AC_DEFINE(HAVE_CONFIGARGS_H, 1, [configargs.h is created])
])
AC_DEFUN_ONCE([MOO_AC_SRCDIR],[
m4_if([$1],[],[CALL_MOO_AC_SRC_DIR_WITH_RIGHT_PARAMETER])
moo_srcdir=`cd "$srcdir/$1" && pwd`
AC_SUBST(moo_srcdir)
MOO_XML2H="$moo_srcdir/mooutils/xml2h.sh"
AC_SUBST(MOO_XML2H)
])
AC_DEFUN_ONCE([MOO_AC_PRIV_FLAGS],[
MOO_AC_FLAGS
MOO_AC_FUNCS
MOO_AC_XML
MOO_AC_PCRE
MOO_AC_PYTHON
dnl must be called after MOO_AC_PYTHON
MOO_AC_LIB
AC_DEFINE(MOO_COMPILATION, 1, [must be 1])
RENDER_LIBS=
if $GDK_X11; then
AC_CHECK_LIB(Xrender, XRenderFindFormat,[
RENDER_LIBS="-lXrender -lXext" # XXX what the heck is this?
AC_DEFINE(HAVE_RENDER, 1, [Define if libXrender is available.])
],[
:
],[-lXext])
fi
MOO_CFLAGS="$MOO_CFLAGS $MOO_PCRE_CFLAGS -DXDG_PREFIX=_moo_edit_xdg -DG_LOG_DOMAIN=\\\"Moo\\\""
MOO_LIBS="$MOO_LIBS $GTK_LIBS $GTHREAD_LIBS $MOO_PCRE_LIBS -lm"
if test "x$build_mooedit" != "xno"; then
MOO_CFLAGS="$MOO_CFLAGS $XML_CFLAGS"
MOO_LIBS="$MOO_LIBS $XML_LIBS"
fi
MOO_CFLAGS="-I`cd "$srcdir/doc" && pwd` $MOO_CFLAGS"
AC_SUBST(MOO_LIBS)
])
##############################################################################
# MOO_AC_FLAGS(moo_top_dir)
#
AC_DEFUN_ONCE([MOO_AC_FLAGS],[
AC_REQUIRE([MOO_AC_CHECK_OS])
AC_REQUIRE([MOO_AC_SET_DIRS])
AC_REQUIRE([MOO_AC_SRCDIR])
AC_PATH_XTRA
MOO_AC_FUNCS
MOO_PKG_CHECK_GTK_VERSIONS
if $GDK_X11; then
AC_PATH_XTRA
fi
MOO_AC_DEBUG
MOO_AC_XML
MOO_AC_PCRE
MOO_AC_PYTHON
dnl must be called after MOO_AC_PYTHON
MOO_AC_LIB
MOO_AC_TOOLS([$1])
MOO_ENABLE_GENERATED_FILES="yes"
AC_ARG_ENABLE(generated-files,
AC_HELP_STRING([--enable-generated-files],[run update-mime-database and gtk-update-icon-cache on install (default = YES)]),[
if test "x$enable_generated_files" = "xno"; then
MOO_ENABLE_GENERATED_FILES="no"
fi ])
AM_CONDITIONAL(MOO_ENABLE_GENERATED_FILES, test x$MOO_ENABLE_GENERATED_FILES = "xyes")
if test x$MOO_OS_DARWIN = xyes; then
_moo_ac_have_carbon=no
AC_MSG_CHECKING([for Mac OS X Carbon support])
AC_TRY_CPP([
#include <Carbon/Carbon.h>
#include <CoreServices/CoreServices.h>
],[
_moo_ac_have_carbon=yes
AC_DEFINE(HAVE_CARBON, 1, [Mac OS X Carbon])
LDFLAGS="$LDFLAGS -framework Carbon"
])
AC_MSG_RESULT([$_moo_ac_have_carbon])
fi
_moo_ac_have_carbon=no
AC_MSG_CHECKING([for Mac OS X Carbon support])
AC_TRY_CPP([
#include <Carbon/Carbon.h>
#include <CoreServices/CoreServices.h>
],[
_moo_ac_have_carbon=yes
AC_DEFINE(HAVE_CARBON, 1, [Mac OS X Carbon])
LDFLAGS="$LDFLAGS -framework Carbon"
])
AC_MSG_RESULT([$_moo_ac_have_carbon])
if "$GDK_QUARTZ"; then
if $GDK_QUARTZ; then
PKG_CHECK_MODULES(IGE_MAC,ige-mac-integration)
GTK_CFLAGS="$IGE_MAC_CFLAGS"
GTK_LIBS="$IGE_MAC_LIBS"
LDFLAGS="$LDFLAGS -framework Cocoa"
fi
AC_CHECK_LIB(Xrender, XRenderFindFormat,[
AC_SUBST(RENDER_LIBS, "-lXrender -lXext")
AC_DEFINE(HAVE_RENDER, 1, [Define if libXrender is available.])
],[
AC_SUBST(RENDER_LIBS, "")
],[-lXext])
AC_DEFINE(MOO_COMPILATION, 1, [must be 1])
moo_top_src_dir=`cd $srcdir && pwd`
MOO_CFLAGS="$MOO_CFLAGS -I"$moo_top_src_dir/$1" $GTK_CFLAGS $MOO_PCRE_CFLAGS -DXDG_PREFIX=_moo_edit_xdg -DG_LOG_DOMAIN=\\\"Moo\\\""
MOO_LIBS="$MOO_LIBS $GTK_LIBS $GTHREAD_LIBS $MOO_PCRE_LIBS -lm"
MOO_CFLAGS="$MOO_CFLAGS $GTK_CFLAGS -I$moo_srcdir"
if test "x$GLIB_2_14" != xyes; then
MOO_CFLAGS="-I$moo_top_src_dir/$1/mooutils/newgtk/glib-2.14 $MOO_CFLAGS"
MOO_CFLAGS="-I$moo_srcdir/mooutils/newgtk/glib-2.14 $MOO_CFLAGS"
fi
if test "x$GLIB_2_12" != xyes; then
MOO_CFLAGS="-I$moo_top_src_dir/$1/mooutils/newgtk/glib-2.12 $MOO_CFLAGS"
MOO_CFLAGS="-I$moo_srcdir/mooutils/newgtk/glib-2.12 $MOO_CFLAGS"
fi
if test "x$GLIB_2_8" != xyes; then
MOO_CFLAGS="-I$moo_top_src_dir/$1/mooutils/newgtk/glib-2.8 $MOO_CFLAGS"
fi
if test x$MOO_USE_GTKHTML = xyes; then
MOO_CFLAGS="$MOO_CFLAGS $GTKHTML_CFLAGS"
MOO_LIBS="$MOO_LIBS $GTKHTML_LIBS"
MOO_CFLAGS="-I$moo_srcdir/mooutils/newgtk/glib-2.8 $MOO_CFLAGS"
fi
if test "x$MOO_OS_MINGW" = xyes; then
MOO_CFLAGS="$MOO_CFLAGS -DWIN32_LEAN_AND_MEAN -DUNICODE"
MOO_WIN32_CFLAGS="-I$moo_top_src_dir/$1/mooutils/moowin32/mingw"
MOO_WIN32_CFLAGS="-I$moo_srcdir/mooutils/moowin32/mingw"
AC_DEFINE(HAVE_MMAP, [1], [using fake mmap on windows])
# gettimeofday is present in recent mingw
AC_CHECK_FUNC(gettimeofday,[:],[
MOO_WIN32_CFLAGS="$MOO_WIN32_CFLAGS -I$moo_top_src_dir/$1/mooutils/moowin32/ms"
MOO_WIN32_CFLAGS="$MOO_WIN32_CFLAGS -I$moo_srcdir/mooutils/moowin32/ms"
])
fi
################################################################################
# MooEdit stuff
#
if test "x$build_mooedit" != "xno"; then
MOO_CFLAGS="$MOO_CFLAGS $XML_CFLAGS"
MOO_LIBS="$MOO_LIBS $XML_LIBS"
fi
AC_SUBST(MOO_WIN32_CFLAGS)
AC_SUBST(MOO_CFLAGS)
AC_SUBST(MOO_LIBS)
_MOO_AC_CONFIGARGS_H
])

19
m4/moo-funcs.m4
View File

@ -3,20 +3,13 @@
# various checks needed in moo
#
AC_DEFUN_ONCE([MOO_AC_FUNCS],[
# backtrace() and friends
AC_CHECK_HEADERS(execinfo.h)
AC_CHECK_FUNCS(backtrace)
# for xdgmime
AC_CHECK_HEADERS(fnmatch.h netinet/in.h)
AC_CHECK_FUNCS(getc_unlocked)
# for GMappedFile
AC_CHECK_HEADERS(unistd.h)
# for GMappedFile and xdgmime
AC_CHECK_FUNCS(mmap)
# for moofileutils.c
AC_CHECK_FUNCS(unlink)
AC_CHECK_HEADERS(unistd.h)
# for mooappabout.h
AC_CHECK_HEADERS(sys/utsname.h)
@ -26,11 +19,11 @@ AC_DEFUN_ONCE([MOO_AC_FUNCS],[
################################################################################
# Terminal stuff
AC_CHECK_HEADERS([poll.h errno.h io.h fcntl.h sys/types.h sys/wait.h signal.h])
AC_CHECK_HEADERS([sys/select.h sys/termios.h sys/un.h stropts.h termios.h wchar.h])
AC_CHECK_HEADERS([poll.h sys/wait.h])
AC_CHECK_HEADERS([sys/termios.h sys/un.h stropts.h termios.h])
AC_CHECK_HEADERS([libutil.h util.h])
AC_CHECK_FUNCS([poll pipe _pipe kill signal posix_openpt])
AC_CHECK_FUNCS([cfmakeraw getpgid getpt grantpt unlockpt ptsname ptsname_r recvmsg])
AC_CHECK_FUNCS([signal posix_openpt])
AC_CHECK_FUNCS([getpt grantpt unlockpt ptsname ptsname_r])
AC_TYPE_PID_T
AC_HEADER_TIOCGWINSZ
################################################################################

62
m4/moo-i18n.m4
View File

@ -1,51 +1,67 @@
##############################################################################
# MOO_AC_I18N
#
AC_DEFUN([MOO_AC_PO_GSV],[
AC_DEFUN_ONCE([MOO_AC_PO_GSV],[
AC_REQUIRE([MOO_AC_I18N])
AC_CONFIG_COMMANDS([po-gsv/Makefile],[sed -e "/POTFILES =/r po-gsv/POTFILES" po-gsv/Makefile.in > po-gsv/Makefile])
IT_PO_SUBDIR([po-gsv])
])
AC_DEFUN([MOO_AC_I18N],[
AC_DEFUN_ONCE([MOO_AC_I18N],[
AC_REQUIRE([MOO_AC_CHECK_OS])
AC_REQUIRE([MOO_AC_SRCDIR])
m4_if([$1],[],[
YOU_FORGOT_TO_CALL_MOO_AC_I18N_WITH_RIGHT_PARAMETERS()
])
_moo_enable_nls=yes
if test "x$MOO_OS_CYGWIN" = "xyes"; then
_moo_enable_nls=no
else
_moo_enable_nls=yes
fi
AC_ARG_ENABLE(nls,
AC_HELP_STRING(--disable-nls, [do not try to use gettext and friends]),
[_moo_enable_nls=$enable_nls],[:])
m4_if([$2],[no],[
_moo_enable_nls=no
],[
AC_ARG_ENABLE(nls,
AC_HELP_STRING(--disable-nls, [do not try to use gettext and friends]),
[_moo_enable_nls=$enable_nls],[:])
])
GETTEXT_PACKAGE=$1
AC_SUBST(GETTEXT_PACKAGE)
AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE", [Name of the gettext package.])
if test "x$MOO_INTLTOOL_MERGE" = x; then
MOO_INTLTOOL_MERGE='$(top_srcdir)/moo/mooutils/moo-intltool-merge'
fi
MOO_INTLTOOL_MERGE='$(moo_srcdir)/mooutils/moo-intltool-merge'
if test "x$_moo_enable_nls" = xyes; then
AC_PROG_INTLTOOL([0.35])
AM_GLIB_GNU_GETTEXT
# these two are copied from intltool, need them under different name to use with --disable-nls
MOO_INTLTOOL_XML_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
MOO_INTLTOOL_DESKTOP_RULE='%.desktop: %.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
MOO_INTLTOOL_INI_RULE='%.ini: %.ini.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
MOO_PO_SUBDIRS_RULE='po-subdirs-stamp: $(top_srcdir)/po/POTFILES.in ; (for potfile in `cat $<`; do echo `dirname $$potfile`; done) | uniq > $(@).dirs && for subdir in `cat $(@).dirs`; do echo $$subdir >> $(@).tmp; mkdir -p $(top_builddir)/$$subdir; done && rm $(@).dirs && mv $(@).tmp $(@)'
MOO_PO_SUBDIRS_RULE2='po-subdirs-stamp-2: $(top_srcdir)/po-gsv/POTFILES.in ; (for potfile in `cat $<`; do echo `dirname $$potfile`; done) | uniq > $(@).dirs && for subdir in `cat $(@).dirs`; do echo $$subdir >> $(@).tmp; mkdir -p $(top_builddir)/$$subdir; done && rm $(@).dirs && mv $(@).tmp $(@)'
else
m4_if([$2],[no],[
MOO_INTLTOOL_XML_RULE='%.xml: %.xml.in $(MOO_INTLTOOL_MERGE) ; $(MOO_INTLTOOL_MERGE) $< [$]@'
MOO_INTLTOOL_DESKTOP_RULE='%.desktop: %.desktop.in $(MOO_INTLTOOL_MERGE) ; $(MOO_INTLTOOL_MERGE) $< [$]@'
MOO_INTLTOOL_INI_RULE='%.ini: %.ini.desktop.in $(MOO_INTLTOOL_MERGE) ; $(MOO_INTLTOOL_MERGE) $< [$]@'
MOO_PO_SUBDIRS_RULE='po-subdirs-stamp: ; echo dummy > po-subdirs-stamp'
MOO_PO_SUBDIRS_RULE2='po-subdirs-stamp-2: ; echo dummy > po-subdirs-stamp-2'
AC_CONFIG_COMMANDS([po/Makefile],[sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile])
fi
],[
if test "x$_moo_enable_nls" = xyes; then
AC_PROG_INTLTOOL([0.35])
AM_GLIB_GNU_GETTEXT
# these two are copied from intltool, need them under different name to use with --disable-nls
MOO_INTLTOOL_XML_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
MOO_INTLTOOL_DESKTOP_RULE='%.desktop: %.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
MOO_INTLTOOL_INI_RULE='%.ini: %.ini.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
MOO_PO_SUBDIRS_RULE='po-subdirs-stamp: $(top_srcdir)/po/POTFILES.in ; (for potfile in `cat $<`; do echo `dirname $$potfile`; done) | uniq > $(@).dirs && for subdir in `cat $(@).dirs`; do echo $$subdir >> $(@).tmp; mkdir -p $(top_builddir)/$$subdir; done && rm $(@).dirs && mv $(@).tmp $(@)'
MOO_PO_SUBDIRS_RULE2='po-subdirs-stamp-2: $(top_srcdir)/po-gsv/POTFILES.in ; (for potfile in `cat $<`; do echo `dirname $$potfile`; done) | uniq > $(@).dirs && for subdir in `cat $(@).dirs`; do echo $$subdir >> $(@).tmp; mkdir -p $(top_builddir)/$$subdir; done && rm $(@).dirs && mv $(@).tmp $(@)'
else
MOO_INTLTOOL_XML_RULE='%.xml: %.xml.in $(MOO_INTLTOOL_MERGE) ; $(MOO_INTLTOOL_MERGE) $< [$]@'
MOO_INTLTOOL_DESKTOP_RULE='%.desktop: %.desktop.in $(MOO_INTLTOOL_MERGE) ; $(MOO_INTLTOOL_MERGE) $< [$]@'
MOO_INTLTOOL_INI_RULE='%.ini: %.ini.desktop.in $(MOO_INTLTOOL_MERGE) ; $(MOO_INTLTOOL_MERGE) $< [$]@'
MOO_PO_SUBDIRS_RULE='po-subdirs-stamp: ; echo dummy > po-subdirs-stamp'
MOO_PO_SUBDIRS_RULE2='po-subdirs-stamp-2: ; echo dummy > po-subdirs-stamp-2'
AC_CONFIG_COMMANDS([po/Makefile],[sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile])
fi
])
AC_SUBST(MOO_INTLTOOL_MERGE)
AC_SUBST(MOO_INTLTOOL_DESKTOP_RULE)

24
m4/moo-mk.m4 Normal file
View File

@ -0,0 +1,24 @@
AC_DEFUN_ONCE([MOO_AM_MIME_MK],[
MOO_ENABLE_GENERATED_FILES="yes"
AC_ARG_ENABLE(generated-files,
AC_HELP_STRING([--enable-generated-files],[run update-mime-database and gtk-update-icon-cache on install (default = YES)]),[
if test "x$enable_generated_files" = "xno"; then
MOO_ENABLE_GENERATED_FILES="no"
fi ])
AM_CONDITIONAL(MOO_ENABLE_GENERATED_FILES, test x$MOO_ENABLE_GENERATED_FILES = "xyes")
])
AC_DEFUN_ONCE([MOO_AM_RC_MK],[
AC_REQUIRE([MOO_AC_CHECK_OS])
if test $MOO_OS_MINGW = "yes"; then
AC_ARG_VAR([WINDRES], [windres])
AC_CHECK_TOOL(WINDRES, windres, :)
fi
])
AC_DEFUN_ONCE([MOO_AM_MK],[
AC_REQUIRE([MOO_AC_I18N])
AC_REQUIRE([MOO_AC_SRCDIR])
MOO_AM_MIME_MK
MOO_AM_RC_MK
])

8
m4/moo-progs.m4
View File

@ -1,8 +0,0 @@
##############################################################################
# MOO_AC_PROGS
# checks for prgoams needed
#
AC_DEFUN([MOO_AC_PROGS],[
AC_ARG_VAR([WINDRES], [windres])
AC_CHECK_TOOL(WINDRES, windres, :)
])

8
m4/moo-tools.m4
View File

@ -1,8 +0,0 @@
AC_DEFUN_ONCE([MOO_AC_TOOLS],[
moo_srcdir=`cd $srcdir && pwd`
moo_srcdir="$moo_srcdir/$1"
AC_SUBST(moo_srcdir)
MOO_XML2H="$moo_srcdir/mooutils/xml2h.sh"
AC_SUBST(MOO_XML2H)
])

97
m4/moo-xml.m4
View File

@ -1,77 +1,40 @@
##############################################################################
# MOO_AC_CHECK_XML_STUFF(action-if-found,action-if-not-found)
# checks whether libxml2 is available, checks some functions and structures
#
AC_DEFUN_ONCE([MOO_AC_CHECK_XML_STUFF],[
PKG_CHECK_MODULES(XML,libxml-2.0,[
_moo_ac_xml_libs=`$PKG_CONFIG --libs-only-l libxml-2.0`
_moo_ac_xml_ldflags=`$PKG_CONFIG --libs-only-L libxml-2.0`
moo_ac_save_CPPFLAGS="$CPPFLAGS"
CPPFLAGS="$CPPFLAGS $XML_CFLAGS"
moo_ac_save_CFLAGS="$CFLAGS"
CFLAGS="$CFLAGS $XML_CFLAGS"
moo_ac_save_LDFLAGS="$LDFLAGS"
LDFLAGS="$LDFLAGS $_moo_ac_xml_ldflags"
moo_ac_save_LIBS="$LIBS"
LIBS="$LIBS $_moo_ac_xml_libs"
AC_CHECK_FUNCS(xmlReadFile xmlParseFile)
AC_CHECK_MEMBER([xmlNode.line],
[AC_DEFINE(HAVE_XMLNODE_LINE,1,[Define if xmlNode structure has 'line' member])],
[],[#include <libxml/tree.h>])
LIBS="$moo_ac_save_LIBS"
LDFLAGS="$moo_ac_save_LDFLAGS"
CFLAGS="$moo_ac_save_CFLAGS"
CPPFLAGS="$moo_ac_save_CPPFLAGS"
MOO_XML_PKG_NAME=libxml-2.0
$1
],[
MOO_XML_PKG_NAME=
$2
])
AC_SUBST(MOO_XML_PKG_NAME)
])
##############################################################################
# MOO_AC_XML([])
#
AC_DEFUN_ONCE([MOO_AC_XML],[
AC_REQUIRE([MOO_AC_CHECK_OS])
AC_REQUIRE([MOO_COMPONENTS])
AC_REQUIRE([MOO_AC_CHECK_OS])
AC_REQUIRE([MOO_COMPONENTS])
MOO_USE_XML="no"
MOO_USE_XML="no"
AC_ARG_WITH([xml],
AC_HELP_STRING([--with-xml], [whether to use libxml2 (default = YES)]),
[MOO_USE_XML=$withval],
[MOO_USE_XML=auto]
)
AC_ARG_WITH([xml],[
AC_HELP_STRING([--with-xml], [whether to use libxml2 (default = YES)])
],[
MOO_USE_XML=$withval
],[
MOO_USE_XML=auto
])
if test x$MOO_OS_CYGWIN != "xyes"; then
if test x$MOO_USE_XML != "xno"; then
MOO_AC_CHECK_XML_STUFF([moo_found_xml=yes],[moo_found_xml=no])
fi
if test x$MOO_USE_XML = "xyes" -a x$moo_found_xml = "xno"; then
AC_MSG_ERROR([libxml2 library not found])
elif test x$MOO_USE_XML != "xno" -a x$moo_found_xml = "xno" -a $MOO_BUILD_EDIT; then
AC_MSG_WARN([libxml2 library not found, syntax highlighting in the editor will be disabled])
fi
if test x$moo_found_xml = "xyes"; then
MOO_USE_XML=yes
AC_MSG_NOTICE([compiling with xml support])
AC_DEFINE(MOO_USE_XML, 1, [use libxml])
else
MOO_USE_XML=no
AC_MSG_NOTICE([compiling without xml support])
fi
if test x$MOO_OS_CYGWIN != "xyes"; then
if test x$MOO_USE_XML != "xno"; then
PKG_CHECK_MODULES(XML,[libxml-2.0],[moo_found_xml=yes],[moo_found_xml=no])
fi
AM_CONDITIONAL(MOO_USE_XML, test x$MOO_USE_XML = xyes)
if test x$MOO_USE_XML = "xyes" -a x$moo_found_xml = "xno"; then
AC_MSG_ERROR([libxml2 library not found])
elif test x$MOO_USE_XML != "xno" -a x$moo_found_xml = "xno" -a $MOO_BUILD_EDIT; then
AC_MSG_WARN([libxml2 library not found, syntax highlighting in the editor will be disabled])
fi
if test x$moo_found_xml = "xyes"; then
MOO_USE_XML=yes
AC_MSG_NOTICE([compiling with xml support])
AC_DEFINE(MOO_USE_XML, 1, [use libxml])
else
MOO_USE_XML=no
AC_MSG_NOTICE([compiling without xml support])
fi
fi
AM_CONDITIONAL(MOO_USE_XML, test x$MOO_USE_XML = xyes)
])

6
medit/Makefile.am
View File

@ -1,6 +1,4 @@
AM_CFLAGS = \
-I$(top_builddir) \
-I../moo \
$(MOO_CFLAGS) \
$(MOO_DEBUG_CFLAGS)
@ -28,8 +26,8 @@ EXTRA_DIST =
CLEANFILES =
include ../mk/rc.mk
medit-credits.h: ../THANKS $(XML2H)
$(SHELL) $(XML2H) THANKS $(srcdir)/../THANKS > $@.tmp && \
medit-credits.h: ../THANKS $(MOO_XML2H)
$(SHELL) $(MOO_XML2H) THANKS $(srcdir)/../THANKS > $@.tmp && \
mv $@.tmp $(srcdir)/medit-credits.h
EXTRA_DIST += medit.desktop.in

2
medit/medit.rc.in
View File

@ -1,6 +1,6 @@
#include <windows.h>
A ICON MOVEABLE PURE LOADONCALL DISCARDABLE "@top_srcdir@/@MOO_SRC_PREFIX@/mooutils/pixmaps/medit.ico"
A ICON MOVEABLE PURE LOADONCALL DISCARDABLE "@moo_srcdir@/mooutils/pixmaps/medit.ico"
VS_VERSION_INFO VERSIONINFO
FILEVERSION @MOO_MAJOR_VERSION@,@MOO_MINOR_VERSION@,@MOO_MICRO_VERSION@,0

1
mk/mime.mk
View File

@ -1,6 +1,7 @@
# -*- makefile -*-
# $(mime_in_files) should be a list of .xml.in files
# call MOO_AM_MIME_MK autoconf macro
mimepackagesdir = $(mimedir)/packages
mime_files = $(patsubst %.xml.in,%.xml,$(mime_in_files))

2
mk/rc.mk
View File

@ -3,6 +3,8 @@
# $(rc_in_files) should be a list of input *.rc.in files
# $(rc_files) is defined to be a list of generated *.res files
# call MOO_AM_RC_MK autoconf macro
if MOO_OS_MINGW
%.res: %.rc.in $(top_builddir)/config.status

19
moo.mprj
View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<medit-project version="1.0" type="C" name="moo">
<active>gtk-cvs</active>
<active>debug</active>
<configurations>
<darwin>
<build_dir>build/darwin</build_dir>
@ -8,22 +8,19 @@
<debug>
<build_dir>build/debug</build_dir>
<configure>
<args>--enable-debug=full --enable-all-warnings --enable-project --enable-unit-tests</args>
<vars>
<var name="CFLAGS">-g</var>
</vars>
<args>--enable-debug --enable-all-warnings --enable-project --enable-unit-tests --prefix=$PREFIX</args>
</configure>
</debug>
<gtk-2.6>
<build_dir>/home/muntyan/projects/gtk-2.6/moo</build_dir>
</gtk-2.6>
<gtk-cvs>
<build_dir>build/debug</build_dir>
<configure>
<args>--enable-debug --enable-all-warnings --prefix=$PREFIX --enable-unit-tests --enable-project</args>
<vars>
<var name="CFLAGS">-g</var>
</vars>
</configure>
</gtk-2.6>
<gtk-cvs>
<build_dir>/Users/muntyan/projects/gtk/moo</build_dir>
<configure>
<args>--enable-debug --enable-all-warnings --prefix=$PREFIX --enable-unit-tests --enable-project</args>
</configure>
</gtk-cvs>
<mingw>

17
moo/Makefile.am
View File

@ -1,5 +1,4 @@
AM_CFLAGS = \
-I$(top_builddir) \
$(MOO_CFLAGS) \
$(MOO_DEBUG_CFLAGS)
@ -9,20 +8,6 @@ ini_files = $(ini_in_files:.ini.in=.ini)
cd $(top_builddir) && $(SHELL) ./config.status --file=$(subdir)/$@
CLEANFILES = $(ini_files)
moo-config-dirs.h: moo-config-dirs.h.stamp
moo-config-dirs.h.stamp: Makefile
{ echo '#define MOO_DATA_DIR "$(MOO_DATA_DIR)"'; \
echo '#define MOO_LIB_DIR "$(MOO_LIB_DIR)"'; \
echo '#define MOO_LOCALE_DIR "$(MOO_LOCALE_DIR)"'; \
echo '#define MOO_HELP_DIR "$(MOO_HELP_DIR)"'; \
} | sed '/""/d' > moo-config-dirs.h.tmp || exit 1
cmp -s moo-config-dirs.h moo-config-dirs.h.tmp || \
mv moo-config-dirs.h.tmp moo-config-dirs.h || exit 1
rm -f moo-config-dirs.h.tmp
echo stamp > moo-config-dirs.h.stamp
BUILT_SOURCES = moo-config-dirs.h.stamp
CLEANFILES += moo-config-dirs.h.stamp moo-config-dirs.h
test_sources = \
moo-test-utils.c \
moo-test-utils.h \
@ -99,7 +84,7 @@ endif
nodist_libmoo_la_SOURCES =
BUILT_SOURCES += marshals.c marshals.list
BUILT_SOURCES = marshals.c marshals.list
nodist_libmoo_la_SOURCES += marshals.c
CLEANFILES += marshals.c marshals.list
marshals.c: marshals.list

4
moo/mooedit/Makefile.am
View File

@ -183,10 +183,6 @@ libmooedit_la_SOURCES = $(mooedit_sources)
libmooedit_la_LIBADD = plugins/libmooeditplugins.la gtksourceview/libgtksourceview.la
AM_CFLAGS = \
-I.. \
-I$(top_builddir) \
-I$(top_srcdir)/doc \
-I$(top_builddir)/doc \
$(MOO_CFLAGS) \
$(MOO_DEBUG_CFLAGS)
AM_OBJCFLAGS = $(AM_CFLAGS)

71
moo/mooedit/gtksourceview/Makefile.am
View File

@ -3,77 +3,73 @@ DIST_SUBDIRS = upstream
noinst_LTLIBRARIES = libgtksourceview.la
AM_CFLAGS = \
-I$(srcdir)/.. \
-I.. \
-I$(srcdir)/../.. \
-I../.. \
-I$(srcdir)/../../mooutils \
-I$(top_builddir) \
-I$(srcdir)/.. \
$(MOO_CFLAGS) \
$(MOO_DEBUG_CFLAGS)
upstream_sources = \
upstream/gtksourcecontextengine.c \
upstream/gtksourcecontextengine.h \
upstream/gtksourceengine.c \
upstream/gtksourceengine.h \
upstream/gtksourceiter.c \
upstream/gtksourcelanguage.c \
upstream/gtksourceiter.h \
upstream/gtksourcelanguage-noxml.c \
upstream/gtksourcelanguage-parser-1.c \
upstream/gtksourcelanguage-parser-2.c \
upstream/gtksourcelanguagemanager.c \
upstream/gtksourcestyle.c \
upstream/gtksourcestyleschememanager.c \
upstream/gtksourcestylescheme.c \
upstream/gtksourcestylescheme-noxml.c \
upstream/gtktextregion.c \
upstream/gtksourcecontextengine.h \
upstream/gtksourceengine.h \
upstream/gtksourceiter.h \
upstream/gtksourcelanguage.h \
upstream/gtksourcelanguage-private.h \
upstream/gtksourcelanguage.c \
upstream/gtksourcelanguage.h \
upstream/gtksourcelanguagemanager.c \
upstream/gtksourcelanguagemanager.h \
upstream/gtksourcestyle-private.h \
upstream/gtksourcestyle.c \
upstream/gtksourcestyle.h \
upstream/gtksourcestyleschememanager.h \
upstream/gtksourcestylescheme-noxml.c \
upstream/gtksourcestylescheme.c \
upstream/gtksourcestylescheme.h \
upstream/gtktextregion.h \
upstream/gtksourcestyleschememanager.c \
upstream/gtksourcestyleschememanager.h \
upstream/gtksourceview-utils.c \
upstream/gtksourceview-utils.h \
upstream/gtksourceview-utils.c
upstream/gtktextregion.c \
upstream/gtktextregion.h
gtksourceview_sources = \
gtksourcecontextengine-mangled.c \
gtksourceengine-mangled.c \
gtksourceiter-mangled.c \
gtksourcelanguagemanager-mangled.c \
gtksourcestyle-mangled.c \
gtksourcestyleschememanager-mangled.c \
gtktextregion-mangled.c \
gtksourceview-utils-mangled.c \
gtksourcecontextengine-mangled.h \
gtksourceengine-mangled.c \
gtksourceengine-mangled.h \
gtksourceiter-mangled.c \
gtksourceiter-mangled.h \
gtksourcelanguagemanager-mangled.c \
gtksourcelanguagemanager-mangled.h \
gtksourcestyle-private-mangled.h \
gtksourcestyle-mangled.c \
gtksourcestyle-mangled.h \
gtksourcestyleschememanager-mangled.h \
gtksourcestyle-private-mangled.h \
gtksourcestylescheme-mangled.h \
gtktextregion-mangled.h \
gtksourceview-utils-mangled.h
gtksourcestyleschememanager-mangled.c \
gtksourcestyleschememanager-mangled.h \
gtksourceview-utils-mangled.c \
gtksourceview-utils-mangled.h \
gtktextregion-mangled.c \
gtktextregion-mangled.h
xml_sources = \
gtksourcestylescheme-mangled.c \
gtksourcelanguage-mangled.c \
gtksourcelanguage-mangled.h \
gtksourcelanguage-parser-1-mangled.c \
gtksourcelanguage-parser-2-mangled.c \
gtksourcelanguage-mangled.h \
gtksourcelanguage-private-mangled.h
gtksourcelanguage-private-mangled.h \
gtksourcestylescheme-mangled.c
no_xml_sources = \
gtksourcelanguage-noxml-mangled.c \
gtksourcestylescheme-noxml-mangled.c
BUILT_SOURCES = $(xml_sources) $(no_xml_sources) $(gtksourceview_sources)
DISTCLEANFILES = $(xml_sources) $(no_xml_sources) $(gtksourceview_sources)
CLEANFILES = $(xml_sources) $(no_xml_sources) $(gtksourceview_sources)
%-mangled.c: upstream/%.c upstream/mangle.sh
$(SHELL) $(srcdir)/upstream/mangle.sh $(srcdir)/upstream/$*.c > $@.tmp && mv $@.tmp $@
@ -84,15 +80,16 @@ upstream/%.lo:
$(MAKE) $*-mangled.lo
libgtksourceview_la_SOURCES = \
$(gtksourceview_sources) \
gtksourceview-i18n.h \
gtksourceview-marshal.h \
gtksourceview-api.h
nodist_libgtksourceview_la_SOURCES = \
$(gtksourceview_sources)
if MOO_USE_XML
libgtksourceview_la_SOURCES += $(xml_sources)
nodist_libgtksourceview_la_SOURCES += $(xml_sources)
EXTRA_DIST = $(no_xml_sources)
else
libgtksourceview_la_SOURCES += $(no_xml_sources)
nodist_libgtksourceview_la_SOURCES += $(no_xml_sources)
EXTRA_DIST = $(xml_sources)
endif

16
moo/mooedit/gtksourceview/gtksourceview-api.h
View File

@ -1,12 +1,12 @@
#ifndef __GTK_SOURCE_VIEW_API_H__
#define __GTK_SOURCE_VIEW_API_H__
#ifndef GTK_SOURCE_VIEW_API_H
#define GTK_SOURCE_VIEW_API_H
#include "mooedit/gtksourceview/gtksourcelanguage-private-mangled.h"
#include "mooedit/gtksourceview/gtksourcelanguagemanager-mangled.h"
#include "mooedit/gtksourceview/gtksourcestyleschememanager-mangled.h"
#include "mooedit/gtksourceview/gtksourceiter-mangled.h"
#include "mooedit/gtksourceview/gtksourcestyle-private-mangled.h"
#include "gtksourceview/gtksourcelanguage-private-mangled.h"
#include "gtksourceview/gtksourcelanguagemanager-mangled.h"
#include "gtksourceview/gtksourcestyleschememanager-mangled.h"
#include "gtksourceview/gtksourceiter-mangled.h"
#include "gtksourceview/gtksourcestyle-private-mangled.h"
#define GtkSourceLanguage MooGtkSourceLanguage
#define GtkSourceLanguageClass MooGtkSourceLanguageClass
@ -49,4 +49,4 @@
#define _gtk_source_style_apply _moo_gtk_source_style_apply
#endif /* __GTK_SOURCE_VIEW_API_H__ */
#endif /* GTK_SOURCE_VIEW_API_H */

8
moo/mooedit/gtksourceview/upstream/gtksourcestylescheme-noxml.c
View File

@ -145,8 +145,8 @@ gtk_source_style_scheme_class_init (GtkSourceStyleSchemeClass *klass)
g_object_class_install_property (object_class,
PROP_ID,
g_param_spec_string ("id",
_("Style scheme id"),
_("Style scheme id"),
"Style scheme id",
"Style scheme id",
NULL,
G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY));
@ -160,8 +160,8 @@ gtk_source_style_scheme_class_init (GtkSourceStyleSchemeClass *klass)
g_object_class_install_property (object_class,
PROP_NAME,
g_param_spec_string ("name",
_("Style scheme name"),
_("Style scheme name"),
"Style scheme name",
"Style scheme name",
NULL,
G_PARAM_READWRITE));

2
moo/mooedit/moocommand-exe.c
View File

@ -30,7 +30,7 @@
#ifdef HAVE_UNISTD_H
#include <unistd.h>
#endif
#ifdef HAVE_IO_H
#ifdef __WIN32__
#include <io.h>
#endif

5
moo/mooedit/plugins/Makefile.am
View File

@ -11,10 +11,7 @@ BUILT_SOURCES =
CLEANFILES =
AM_CFLAGS = \
-I../.. \
-I$(top_builddir) \
-I$(top_srcdir)/doc \
-I$(top_builddir)/doc \
-I.. \
$(MOO_CFLAGS) \
$(MOO_DEBUG_CFLAGS)
AM_OBJCFLAGS = $(AM_CFLAGS)

2
moo/mooedit/plugins/ctags/Makefile.am
View File

@ -1,7 +1,5 @@
AM_CFLAGS = \
-I../.. \
-I$(top_builddir) \
-I$(top_builddir)/moo \
$(MOO_CFLAGS) \
$(MOO_DEBUG_CFLAGS)
AM_OBJCFLAGS = $(AM_CFLAGS)

2
moo/mooedit/plugins/ctags/ctags-view.c
View File

@ -14,7 +14,7 @@
#include "ctags-view.h"
#include "ctags-doc.h"
#include "mooedit/plugins/mooeditplugins.h"
#include "mooedit/marshals.h"
#include "marshals.h"
#include <mooutils/mooutils-gobject.h>
#include <mooutils/mooutils-treeview.h>
#include <gtk/gtk.h>

2
moo/mooedit/plugins/moofileselector.c
View File

@ -20,7 +20,7 @@
#include "moofileview/moofileview-tools.h"
#include "mooeditplugins.h"
#include "moofileselector-glade.h"
#include "mooedit/marshals.h"
#include "marshals.h"
#include "mooutils/moostock.h"
#include "mooutils/mooutils-fs.h"
#include "mooutils/mooutils-misc.h"

11
moo/moofileview/Makefile.am
View File

@ -34,20 +34,18 @@ moofileview_sources = \
mootreeview.c \
mootreeview.h
moofileview_pixmaps = \
symlink.png \
symlink-small.png
BUILT_SOURCES = symlink.h
CLEANFILES = symlink.h
BUILT_SOURCES = moofileicons-symlink.h
CLEANFILES = moofileicons-symlink.h
EXTRA_DIST = $(moofileview_pixmaps)
symlink.h: $(moofileview_pixmaps)
moofileicons-symlink.h: $(moofileview_pixmaps)
gdk-pixbuf-csource --static --build-list \
SYMLINK_ARROW $(srcdir)/symlink.png \
SYMLINK_ARROW_SMALL $(srcdir)/symlink-small.png > $@.tmp && mv $@.tmp $@
glade_files = \
glade/moofileview-drop.glade \
glade/moofileprops.glade \
@ -63,10 +61,7 @@ noinst_LTLIBRARIES = libmoofileview.la
libmoofileview_la_SOURCES = $(moofileview_sources)
AM_CFLAGS = \
-I.. \
-I$(top_builddir) \
$(MOO_CFLAGS) \
$(MOO_DEBUG_CFLAGS)
include ../../mk/marshals.mk

2
moo/moofileview/moofileicons.c
View File

@ -15,7 +15,7 @@
#endif
#include "moofileview/moofileicons.h"
#include "moofileview/symlink.h"
#include "moofileicons-symlink.h"
#include "mooutils/mooutils-misc.h"
#include "mooutils/mooutils-debug.h"
#include "mooutils/moostock.h"

2
moo/moopython/Makefile.am
View File

@ -59,8 +59,6 @@ noinst_LTLIBRARIES += libmoomod.la libpymoo.la
endif !MOO_OS_UNIX
AM_CFLAGS = \
-I.. \
-I$(top_builddir) \
$(MOO_CFLAGS) \
$(MOO_DEBUG_CFLAGS) \
$(PYTHON_INCLUDES) \

2
moo/moopython/pygtk/Makefile.am
View File

@ -175,8 +175,6 @@ nodist_libmoopygtk_la_SOURCES = $(nodist_moopygtk_sources)
libmoopygtk_la_LIBADD =
common_cflags = \
-I../.. \
-I$(top_builddir) \
$(MOO_CFLAGS) \
$(MOO_DEBUG_CFLAGS) \
$(MOO_W_NO_WRITE_STRINGS)\

4
moo/moopython/pygtk/moo-pygtk.c
View File

@ -1,7 +1,7 @@
/*
* moo-pygtk.c
*
* Copyright (C) 2004-2007 by Yevgen Muntyan <muntyan@math.tamu.edu>
* Copyright (C) 2004-2008 by Yevgen Muntyan <muntyan@tamu.edu>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@ -16,7 +16,7 @@
#include "config.h"
#endif
#include "moopython/pygtk/moo-mod.h"
#include "moo-mod.h"
#include "moopython/pygtk/moo-pygtk.h"
#include "moopython/moopython-utils.h"
#include <pygobject.h> /* _PyGObjectAPI lives here */

4
moo/moopython/pygtk/mooedit-mod.c
View File

@ -1,7 +1,7 @@
/*
* mooedit-mod.c
*
* Copyright (C) 2004-2007 by Yevgen Muntyan <muntyan@math.tamu.edu>
* Copyright (C) 2004-2008 by Yevgen Muntyan <muntyan@tamu.edu>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@ -15,7 +15,7 @@
#include <pygobject.h>
#include <glib.h>
#include "moopython/pygtk/moo-pygtk.h"
#include "moopython/pygtk/mooedit-mod.h"
#include "mooedit-mod.h"
#include "mooedit/mooplugin.h"

4
moo/moopython/pygtk/mooterm-mod.c
View File

@ -1,7 +1,7 @@
/*
* mooterm-mod.c
*
* Copyright (C) 2004-2007 by Yevgen Muntyan <muntyan@math.tamu.edu>
* Copyright (C) 2004-2008 by Yevgen Muntyan <muntyan@tamu.edu>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@ -15,7 +15,7 @@
#include <pygobject.h>
#include <glib.h>
#include "moopython/pygtk/moo-pygtk.h"
#include "moopython/pygtk/mooterm-mod.h"
#include "mooterm-mod.h"
#include "moopython/moopython-utils.h"

4
moo/moopython/pygtk/mooui-mod.c
View File

@ -1,7 +1,7 @@
/*
* mooui-mod.c
*
* Copyright (C) 2004-2007 by Yevgen Muntyan <muntyan@math.tamu.edu>
* Copyright (C) 2004-2008 by Yevgen Muntyan <muntyan@tamu.edu>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@ -15,7 +15,7 @@
#include <pygobject.h>
#include <glib.h>
#include "moopython/pygtk/moo-pygtk.h"
#include "moopython/pygtk/mooui-mod.h"
#include "mooui-mod.h"
static char *moo_ui_module_doc = "_moo_ui module.";

4
moo/moopython/pygtk/mooutils-mod.c
View File

@ -1,7 +1,7 @@
/*
* mooutils-mod.c
*
* Copyright (C) 2004-2007 by Yevgen Muntyan <muntyan@math.tamu.edu>
* Copyright (C) 2004-2008 by Yevgen Muntyan <muntyan@tamu.edu>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@ -18,7 +18,7 @@
#include <pygobject.h>
#include <glib.h>
#include "moopython/pygtk/moo-pygtk.h"
#include "moopython/pygtk/mooutils-mod.h"
#include "mooutils-mod.h"
#include "moopython/moopython-utils.h"
#include "mooutils/moostock.h"

13
moo/mooterm/Makefile.am
View File

@ -80,8 +80,6 @@ EXTRA_DIST += $(mooterm_unix_sources)
endif
AM_CFLAGS = \
-I$(top_builddir) \
-I.. \
$(MOO_CFLAGS) \
$(MOO_DEBUG_CFLAGS)
@ -90,12 +88,11 @@ noinst_PROGRAMS = termhelper
termhelper_SOURCES = $(termhelper_sources)
nodist_termhelper_SOURCES = mootermhelper_res.res
CLEANFILES += mootermhelper_res.res
termhelper_CFLAGS = \
-I$(top_builddir) \
-I$(top_srcdir) \
-I$(top_srcdir)/$(MOO_SRC_PREFIX) \
-I$(top_builddir)/$(MOO_SRC_PREFIX) \
$(MOO_DEBUG_CFLAGS) \
termhelper_CFLAGS = \
-I$(top_builddir) \
-I$(srcdir)/.. \
-I.. \
$(MOO_DEBUG_CFLAGS) \
$(CFLAGS)
mootermhelper_res.res: mootermhelper_res.rc
$(WINDRES) -i mootermhelper_res.rc --input-format=rc -o mootermhelper_res.res -O coff

4
moo/mooui/Makefile.am
View File

@ -24,10 +24,6 @@ glade_files = glade/mooappabout.glade
include ../../mk/glade.mk
AM_CFLAGS = \
-I.. \
-I$(top_builddir) \
-I$(top_srcdir)/doc \
-I$(top_builddir)/doc \
$(MOO_CFLAGS) \
$(MOO_DEBUG_CFLAGS)

2
moo/mooui/smclient/Makefile.am
View File

@ -1,6 +1,4 @@
AM_CFLAGS = \
-I$(top_builddir) \
$(MOO_DEBUG_CFLAGS) \
$(MOO_CFLAGS) \
$(MOO_DEBUG_CFLAGS) \
$(MOO_W_NO_UNUSED)

4
moo/mooutils/Makefile.am
View File

@ -206,10 +206,6 @@ objc_flag = "-xobjective-c"
endif
AM_CFLAGS = \
-I$(top_builddir) \
-I.. \
-I$(top_srcdir)/doc \
-I$(top_builddir)/doc \
$(MOO_CFLAGS) \
$(MOO_DEBUG_CFLAGS) \
$(MOO_WIN32_CFLAGS) \

4
moo/mooutils/moofiledialog.c
View File

@ -11,13 +11,13 @@
*/
#include "config.h"
#include <gtk/gtk.h>
#include "mooutils/moodialogs.h"
#include "mooutils/mooprefs.h"
#include "mooutils/mooutils-misc.h"
#include "mooutils/marshals.h"
#include "mooutils/mooencodings.h"
#include "mooutils/moohelp.h"
#include "marshals.h"
#include <gtk/gtk.h>
#include <string.h>

4
moo/mooutils/mooutils-fs.c
View File

@ -1218,12 +1218,8 @@ _moo_rename (const char *old_name,
/* Glob matching
*/
#if 0 && defined(HAVE_FNMATCH_H)
#include <fnmatch.h>
#else
#define MOO_GLOB_REGEX
#include <glib/gregex.h>
#endif
typedef struct _MooGlob {
#ifdef MOO_GLOB_REGEX

1
moo/mooutils/newgtk/Makefile.am
View File

@ -32,7 +32,6 @@ libnewgtk_la_SOURCES += glib-2.8/glib/gmappedfile.c
endif
AM_CFLAGS = \
-I$(top_builddir) \
$(pcre_cflags) \
$(MOO_CFLAGS) \
$(MOO_DEBUG_CFLAGS) \

27
po-gsv/POTFILES.in
View File

@ -1,26 +1,29 @@
moo/mooedit/gtksourceview/upstream/gtksourcecontextengine.c
moo/mooedit/gtksourceview/upstream/gtksourcelanguage-parser-2.c
moo/mooedit/gtksourceview/upstream/gtksourcelanguagemanager.c
moo/mooedit/gtksourceview/upstream/gtksourcestyleschememanager.c
moo/mooedit/gtksourceview/upstream/gtksourcestylescheme.c
moo/mooedit/gtksourceview/upstream/gtksourcelanguage.c
moo/mooedit/gtksourceview/upstream/gtksourcelanguagemanager.c
moo/mooedit/gtksourceview/upstream/gtksourcestyle.c
moo/mooedit/gtksourceview/upstream/gtksourcestylescheme.c
moo/mooedit/gtksourceview/upstream/gtksourcestyleschememanager.c
moo/mooedit/language-specs/R.lang
moo/mooedit/language-specs/ada.lang
moo/mooedit/language-specs/awk.lang
moo/mooedit/language-specs/boo.lang
moo/mooedit/language-specs/c.lang
moo/mooedit/language-specs/changelog.lang
moo/mooedit/language-specs/chdr.lang
moo/mooedit/language-specs/c.lang
moo/mooedit/language-specs/classic.xml
moo/mooedit/language-specs/cpp.lang
moo/mooedit/language-specs/csharp.lang
moo/mooedit/language-specs/css.lang
moo/mooedit/language-specs/d.lang
moo/mooedit/language-specs/def.lang
moo/mooedit/language-specs/desktop.lang
moo/mooedit/language-specs/diff.lang
moo/mooedit/language-specs/d.lang
moo/mooedit/language-specs/docbook.lang
moo/mooedit/language-specs/dpatch.lang
moo/mooedit/language-specs/dtd.lang
moo/mooedit/language-specs/eiffel.lang
moo/mooedit/language-specs/erlang.lang
moo/mooedit/language-specs/forth.lang
moo/mooedit/language-specs/fortran.lang
@ -28,13 +31,14 @@ moo/mooedit/language-specs/gap.lang
moo/mooedit/language-specs/gtk-doc.lang
moo/mooedit/language-specs/gtkrc.lang
moo/mooedit/language-specs/haddock.lang
moo/mooedit/language-specs/haskell.lang
moo/mooedit/language-specs/haskell-literate.lang
moo/mooedit/language-specs/haskell.lang
moo/mooedit/language-specs/html.lang
moo/mooedit/language-specs/idl.lang
moo/mooedit/language-specs/ini.lang
moo/mooedit/language-specs/java.lang
moo/mooedit/language-specs/javascript.lang
moo/mooedit/language-specs/kate.xml
moo/mooedit/language-specs/latex.lang
moo/mooedit/language-specs/libtool.lang
moo/mooedit/language-specs/lua.lang
@ -43,6 +47,7 @@ moo/mooedit/language-specs/makefile.lang
moo/mooedit/language-specs/msil.lang
moo/mooedit/language-specs/nemerle.lang
moo/mooedit/language-specs/objc.lang
moo/mooedit/language-specs/oblivion.xml
moo/mooedit/language-specs/ocaml.lang
moo/mooedit/language-specs/ocl.lang
moo/mooedit/language-specs/octave.lang
@ -52,13 +57,13 @@ moo/mooedit/language-specs/php.lang
moo/mooedit/language-specs/pkgconfig.lang
moo/mooedit/language-specs/po.lang
moo/mooedit/language-specs/python.lang
moo/mooedit/language-specs/R.lang
moo/mooedit/language-specs/rpmspec.lang
moo/mooedit/language-specs/ruby.lang
moo/mooedit/language-specs/scheme.lang
moo/mooedit/language-specs/sh.lang
moo/mooedit/language-specs/sql.lang
moo/mooedit/language-specs/t2t.lang
moo/mooedit/language-specs/tango.xml
moo/mooedit/language-specs/tcl.lang
moo/mooedit/language-specs/texinfo.lang
moo/mooedit/language-specs/vala.lang
@ -67,9 +72,3 @@ moo/mooedit/language-specs/verilog.lang
moo/mooedit/language-specs/vhdl.lang
moo/mooedit/language-specs/xml.lang
moo/mooedit/language-specs/yacc.lang
moo/mooedit/language-specs/eiffel.lang
moo/mooedit/language-specs/classic.xml
moo/mooedit/language-specs/oblivion.xml
moo/mooedit/language-specs/kate.xml
moo/mooedit/language-specs/tango.xml

143
po-gsv/POTFILES.skip
View File

@ -1,39 +1,19 @@
medit/main.c
medit/medit.desktop.in
moo/mooui/glade/mooappabout.glade
moo/mooui/mooappabout.c
moo/mooui/mooapp.c
moo/mooui/moohtml.c
moo/mooui/smclient/eggdesktopfile.c
moo/mooui/smclient/egg-session-end.c
moo/mooui/smclient/eggsmclient.c
moo/mooui/smclient/eggsmclient-libgnomeui.c
moo/mooui/smclient/logout-test.c
xcode/
build/
medit/
moo/mooapp-old/
moo/moofileview/
moo/mooui/
moo/moopython/
moo/mooterm/
moo/mooutils/
moo/mooedit/glade/
moo/mooedit/plugins/
moo/mooedit/filters.xml
moo/mooedit/glade/mooeditprefs-file.glade
moo/mooedit/glade/mooeditprefs-general.glade
moo/mooedit/glade/mooeditprefs.glade
moo/mooedit/glade/mooeditprefs-langs.glade
moo/mooedit/glade/mooeditprefs-view.glade
moo/mooedit/glade/mooeditsavemult.glade
moo/mooedit/glade/mooedittools.glade
moo/mooedit/glade/moopluginprefs.glade
moo/mooedit/glade/mooprint.glade
moo/mooedit/glade/mooprintpreview.glade
moo/mooedit/glade/mooquicksearch.glade
moo/mooedit/glade/mootextfind.glade
moo/mooedit/glade/mootextgotoline.glade
moo/mooedit/gtksourceview/gtksourcecontextengine-mangled.c
moo/mooedit/gtksourceview/gtksourcelanguagemanager-mangled.c
moo/mooedit/gtksourceview/gtksourcelanguage-mangled.c
moo/mooedit/gtksourceview/gtksourcelanguage-parser-2-mangled.c
moo/mooedit/gtksourceview/gtksourcestyle-mangled.c
moo/mooedit/gtksourceview/gtksourcestyleschememanager-mangled.c
moo/mooedit/gtksourceview/gtksourcestylescheme-mangled.c
moo/mooedit/gtksourceview/gtksourcestylescheme-noxml-mangled.c
moo/mooedit/gtksourceview/upstream/gtksourcestyle.c
moo/mooedit/gtksourceview/upstream/gtksourcestylescheme-noxml.c
moo/mooedit/medit.ui
moo/mooedit/medit.xml
moo/mooedit/moo.xml.in
moo/mooedit/moocommand-exe.c
moo/mooedit/moocommand-lua.c
moo/mooedit/mooeditaction-factory.c
@ -43,81 +23,20 @@ moo/mooedit/mooeditor.c
moo/mooedit/mooeditprefspage.c
moo/mooedit/mooeditwindow.c
moo/mooedit/mootextfind.c
moo/mooedit/moousertools.c
moo/mooedit/moousertools-prefs.c
moo/mooedit/moo.xml.in
moo/mooedit/plugins/completion/completion.glade
moo/mooedit/plugins/completion/completion-plugin.c
moo/mooedit/plugins/fileselector/moofileselector.c
moo/mooedit/plugins/fileselector/moofileselector.glade
moo/mooedit/plugins/fileselector/moofileselector-prefs.c
moo/mooedit/plugins/fileselector/moofileselector-prefs.glade
moo/mooedit/plugins/moofilelist.c
moo/mooedit/plugins/moofileselector.c
moo/mooedit/plugins/moofileselector.glade
moo/mooedit/plugins/moofileselector-prefs.c
moo/mooedit/plugins/moofileselector-prefs.glade
moo/mooedit/plugins/moofind.c
moo/mooedit/plugins/moofind.glade
moo/moofileview/glade/bookmark_editor.glade
moo/moofileview/glade/drop.glade
moo/moofileview/glade/moobookmark-editor.glade
moo/moofileview/glade/moocreatefolder.glade
moo/moofileview/glade/moofileprops.glade
moo/moofileview/glade/moofileview-drop.glade
moo/moofileview/moofileview.c
moo/moofileview/moofileview.ui
moo/moopython/plugins/medit/runpython.py
moo/moopython/plugins/pycmd.py
moo/moopython/plugins/pyproject/mprj/config/view.py
moo/moopython/plugins/pyproject/mprj/manager.py
moo/moopython/plugins/pyproject/mprj/optdialog.py
moo/moopython/plugins/pyproject/mprj/simple.glade
moo/moopython/plugins/pyproject/mprj/simple.py
moo/moopython/plugins/pyproject/project-plugin.ini.desktop.in.in
moo/moopython/plugins/pyproject/projects/cproj/config.py
moo/moopython/plugins/pyproject/projects/cproj/optdialog.py
moo/moopython/plugins/pyproject/projects/cproj/options.glade
moo/moopython/plugins/pyproject/projects/c.py
moo/moopython/plugins/pyproject/projects/latex.py
moo/moopython/plugins/pyproject/projects/pyproj/config.py
moo/moopython/plugins/pyproject/projects/pyproj/optdialog.py
moo/moopython/plugins/pyproject/projects/pyproj/options.glade
moo/moopython/plugins/pyproject/projects/python.py
moo/moopython/plugins/python.ini.desktop.in.in
moo/moopython/plugins/python.py
moo/moopython/plugins/terminal.ini.desktop.in.in
moo/moopython/plugins/terminal.py
moo/moopython/pygtk/goocanvas/goocanvas.c
moo/moopython/pygtk/goocanvas/goocanvasellipse.c
moo/moopython/pygtk/goocanvas/goocanvasimage.c
moo/moopython/pygtk/goocanvas/goocanvasitem.c
moo/moopython/pygtk/goocanvas/goocanvasitemmodel.c
moo/moopython/pygtk/goocanvas/goocanvasitemsimple.c
moo/moopython/pygtk/goocanvas/goocanvaspath.c
moo/moopython/pygtk/goocanvas/goocanvaspolyline.c
moo/moopython/pygtk/goocanvas/goocanvasrect.c
moo/moopython/pygtk/goocanvas/goocanvastable.c
moo/moopython/pygtk/goocanvas/goocanvastext.c
moo/moopython/pygtk/goocanvas/goocanvaswidget.c
moo/mooscript/mooscript-yacc.c
moo/mooterm/glade/mootermprefs.glade
moo/mooterm/mootermparser-yacc.c
moo/mooutils/glade/accelprefs.glade
moo/mooutils/glade/mooaccelprefs.glade
moo/mooutils/moocompat.c
moo/mooutils/moodialogs.c
moo/mooutils/mooencodings.c
moo/mooutils/mooencodings-data.h
moo/mooutils/moofiltermgr.c
moo/mooutils/moofontsel.c
moo/mooutils/moohelp.c
moo/mooutils/moopane.c
moo/mooutils/moostock.c
moo/mooutils/moowindow.c
moo/mooutils/newgtk/glib-2.14/glib/gregex.c
moo/mooutils/newgtk/glib-2.8/glib/gmappedfile.c
moo/mooutils/newgtk/glib/gregex.c
moo/mooutils/newgtk/gmappedfile.c
moo/mooutils/newgtk/gtkcolorbutton.c
moo/mooutils/newgtk/gtkfontbutton.c
moo/mooedit/moousertools.c
moo/mooedit/gtksourceview/gtksourcecontextengine-mangled.c
moo/mooedit/gtksourceview/gtksourcelanguage-mangled.c
moo/mooedit/gtksourceview/gtksourcelanguage-parser-2-mangled.c
moo/mooedit/gtksourceview/gtksourcelanguagemanager-mangled.c
moo/mooedit/gtksourceview/gtksourcestyle-mangled.c
moo/mooedit/gtksourceview/gtksourcestylescheme-mangled.c
moo/mooedit/gtksourceview/gtksourcestyleschememanager-mangled.c
moo/mooedit/gtksourceview/gtksourcecontextengine-mangled.c
moo/mooedit/gtksourceview/gtksourcelanguage-mangled.c
moo/mooedit/gtksourceview/gtksourcelanguage-parser-2-mangled.c
moo/mooedit/gtksourceview/gtksourcelanguagemanager-mangled.c
moo/mooedit/gtksourceview/gtksourcestyle-mangled.c
moo/mooedit/gtksourceview/gtksourcestylescheme-mangled.c
moo/mooedit/gtksourceview/gtksourcestyleschememanager-mangled.c

36
po/POTFILES.in
View File

@ -1,11 +1,7 @@
medit/main.c
medit/medit.desktop.in
moo/mooui/glade/mooappabout.glade
moo/mooui/mooappabout.c
moo/mooui/mooapp.c
moo/mooui/moohtml.c
medit/meditapp.c
moo/mooedit/filters.xml
moo/mooedit/glade/mooeditprefs-file.glade
moo/mooedit/glade/mooeditprefs-general.glade
moo/mooedit/glade/mooeditprefs-langs.glade
@ -19,9 +15,8 @@ moo/mooedit/glade/mooprintpreview.glade
moo/mooedit/glade/mooquicksearch.glade
moo/mooedit/glade/mootextfind.glade
moo/mooedit/glade/mootextgotoline.glade
moo/mooedit/filters.xml
moo/mooedit/medit.ui
moo/mooedit/medit.xml
moo/mooedit/moo.xml.in
moo/mooedit/moocommand-exe.c
moo/mooedit/moocommand-lua.c
moo/mooedit/mooeditaction-factory.c
@ -29,42 +24,41 @@ moo/mooedit/mooeditdialogs.c
moo/mooedit/mooeditfileops.c
moo/mooedit/mooeditor.c
moo/mooedit/mooeditprefspage.c
moo/mooedit/mooedit.ui
moo/mooedit/mooeditwindow.c
moo/mooedit/mootextfind.c
moo/mooedit/mootextstylescheme.c
moo/mooedit/moousertools.c
moo/mooedit/moousertools-prefs.c
moo/mooedit/moo.xml.in
moo/mooedit/moousertools.c
moo/mooedit/plugins/moofilelist.c
moo/mooedit/plugins/moofileselector.c
moo/mooedit/plugins/moofileselector.glade
moo/mooedit/plugins/moofileselector-prefs.c
moo/mooedit/plugins/moofileselector-prefs.glade
moo/mooedit/plugins/moofileselector.c
moo/mooedit/plugins/moofileselector.glade
moo/mooedit/plugins/moofind.c
moo/mooedit/plugins/moofind.glade
moo/moofileview/glade/moobookmark-editor.glade
moo/moofileview/glade/moocreatefolder.glade
moo/moofileview/glade/moofileprops.glade
moo/moofileview/glade/moofileview-drop.glade
moo/moofileview/moofileview.c
moo/moofileview/moofileview.ui
moo/moofileview/moofileview.xml
moo/moopython/plugins/medit/runpython.py
moo/moopython/plugins/pycmd.py
moo/moopython/plugins/python.ini.desktop.in.in
moo/moopython/plugins/python.py
moo/moopython/plugins/terminal.ini.desktop.in.in
moo/moopython/plugins/terminal.py
moo/mooui/glade/mooappabout.glade
moo/mooui/mooapp.c
moo/mooui/mooappabout.c
moo/mooui/moohtml.c
moo/mooui/smclient/eggdesktopfile.c
moo/mooui/smclient/eggsmclient.c
moo/mooutils/glade/mooaccelprefs.glade
moo/mooutils/glade/moologwindow.glade
moo/mooutils/moodialogs.c
moo/mooutils/mooencodings.c
moo/mooutils/mooencodings-data.h
moo/mooutils/mooencodings.c
moo/mooutils/moofiltermgr.c
moo/mooutils/moofontsel.c
moo/mooutils/moohelp.c

143
po/POTFILES.skip
View File

@ -1,135 +1,28 @@
moo/mooapp/smclient/logout-test.c
moo/mooapp/smclient/egg-session-end.c
moo/mooapp/smclient/eggdesktopfile.c
moo/mooapp/smclient/eggsmclient-libgnomeui.c
moo/mooapp/smclient/eggsmclient.c
xcode/
build/
moo/mooapp-old/
moo/mooedit/gtksourceview/upstream/
moo/mooedit/language-specs/
moo/mooedit/plugins/completion/
moo/moopython/plugins/pyproject/
moo/mooutils/newgtk/
moo/mooutils/newgtk/glib-2.14/glib/gregex.c
moo/mooutils/newgtk/glib-2.8/glib/gmappedfile.c
moo/mooutils/moocompat.c
moo/mooscript/mooscript-yacc.c
moo/mooedit/plugins/completion/completion.glade
moo/mooedit/plugins/completion/completion-plugin.c
moo/mooedit/language-specs/eiffel.lang
moo/mooedit/language-specs/cil.lang
moo/mooedit/language-specs/R.lang
moo/mooedit/language-specs/ada.lang
moo/mooedit/language-specs/c.lang
moo/mooedit/language-specs/changelog.lang
moo/mooedit/language-specs/cpp.lang
moo/mooedit/language-specs/csharp.lang
moo/mooedit/language-specs/css.lang
moo/mooedit/language-specs/def.lang
moo/mooedit/language-specs/desktop.lang
moo/mooedit/language-specs/diff.lang
moo/mooedit/language-specs/forth.lang
moo/mooedit/language-specs/fortran.lang
moo/mooedit/language-specs/gap.lang
moo/mooedit/language-specs/gtkrc.lang
moo/mooedit/language-specs/haskell.lang
moo/mooedit/language-specs/html.lang
moo/mooedit/language-specs/idl.lang
moo/mooedit/language-specs/ini.lang
moo/mooedit/language-specs/java.lang
moo/mooedit/language-specs/javascript.lang
moo/mooedit/language-specs/latex.lang
moo/mooedit/language-specs/lua.lang
moo/mooedit/language-specs/m4.lang
moo/mooedit/language-specs/makefile.lang
moo/mooedit/language-specs/ms.lang
moo/mooedit/language-specs/msil.lang
moo/mooedit/language-specs/nemerle.lang
moo/mooedit/language-specs/octave.lang
moo/mooedit/language-specs/pascal.lang
moo/mooedit/language-specs/perl.lang
moo/mooedit/language-specs/php.lang
moo/mooedit/language-specs/po.lang
moo/mooedit/language-specs/python.lang
moo/mooedit/language-specs/ruby.lang
moo/mooedit/language-specs/scheme.lang
moo/mooedit/language-specs/sh.lang
moo/mooedit/language-specs/sql.lang
moo/mooedit/language-specs/t2t.lang
moo/mooedit/language-specs/tcl.lang
moo/mooedit/language-specs/texinfo.lang
moo/mooedit/language-specs/vbnet.lang
moo/mooedit/language-specs/verilog.lang
moo/mooedit/language-specs/vhdl.lang
moo/mooedit/language-specs/xml.lang
moo/mooedit/language-specs/yacc.lang
moo/mooedit/language-specs/boo.lang
moo/mooedit/language-specs/d.lang
moo/mooedit/language-specs/dpatch.lang
moo/mooedit/language-specs/dtd.lang
moo/mooedit/language-specs/gtk-doc.lang
moo/mooedit/language-specs/libtool.lang
moo/mooedit/language-specs/pkgconfig.lang
moo/mooedit/language-specs/docbook.lang
moo/mooedit/language-specs/ocaml.lang
moo/mooedit/language-specs/spec.lang
moo/mooedit/language-specs/awk.lang
moo/mooedit/language-specs/chdr.lang
moo/mooedit/language-specs/haddock.lang
moo/mooedit/language-specs/haskell-literate.lang
moo/mooedit/language-specs/objc.lang
moo/mooedit/language-specs/ocl.lang
moo/mooedit/language-specs/erlang.lang
moo/mooedit/language-specs/rpmspec.lang
moo/mooedit/language-specs/vala.lang
moo/mooedit/language-specs/tango.xml
moo/mooedit/language-specs/kate.xml
moo/mooedit/language-specs/classic.xml
moo/mooedit/language-specs/oblivion.xml
moo/moopython/plugins/pyproject/project-plugin.ini.desktop.in.in
moo/moopython/plugins/pyproject/mprj/manager.py
moo/moopython/plugins/pyproject/mprj/simple.py
moo/moopython/plugins/pyproject/mprj/config/view.py
moo/moopython/plugins/pyproject/mprj/optdialog.py
moo/moopython/plugins/pyproject/mprj/simple.glade
moo/moopython/plugins/pyproject/projects/c.py
moo/moopython/plugins/pyproject/projects/cproj/config.py
moo/moopython/plugins/pyproject/projects/cproj/optdialog.py
moo/moopython/plugins/pyproject/projects/cproj/options.glade
moo/moopython/plugins/pyproject/projects/latex.py
moo/moopython/plugins/pyproject/projects/pyproj/config.py
moo/moopython/plugins/pyproject/projects/pyproj/optdialog.py
moo/moopython/plugins/pyproject/projects/pyproj/options.glade
moo/moopython/plugins/pyproject/projects/python.py
moo/mooterm/mootermparser-yacc.c
moo/mooterm/glade/mootermprefs.glade
moo/mooterm/mootermparser-yacc.c
moo/moopython/pygtk/goocanvas/goocanvas.c
moo/moopython/pygtk/goocanvas/goocanvasellipse.c
moo/moopython/pygtk/goocanvas/goocanvasimage.c
moo/moopython/pygtk/goocanvas/goocanvasitem.c
moo/moopython/pygtk/goocanvas/goocanvasitemmodel.c
moo/moopython/pygtk/goocanvas/goocanvasitemsimple.c
moo/moopython/pygtk/goocanvas/goocanvaspath.c
moo/moopython/pygtk/goocanvas/goocanvaspolyline.c
moo/moopython/pygtk/goocanvas/goocanvasrect.c
moo/moopython/pygtk/goocanvas/goocanvastable.c
moo/moopython/pygtk/goocanvas/goocanvastext.c
moo/moopython/pygtk/goocanvas/goocanvaswidget.c
moo/mooedit/gtksourceview/upstream/gtksourcecontextengine.c
moo/mooedit/gtksourceview/upstream/gtksourcelanguage-parser-2.c
moo/mooedit/gtksourceview/upstream/gtksourcelanguagemanager.c
moo/mooedit/gtksourceview/upstream/gtksourcestyleschememanager.c
moo/mooedit/gtksourceview/upstream/gtksourcestylescheme.c
moo/mooedit/gtksourceview/upstream/gtksourcestyle.c
moo/mooedit/gtksourceview/upstream/gtksourcelanguage.c
moo/mooedit/gtksourceview/upstream/gtksourcestylescheme-noxml.c
moo/mooedit/gtksourceview/gtksourcecontextengine-mangled.c
moo/mooedit/gtksourceview/gtksourcelanguage-mangled.c
moo/mooedit/gtksourceview/gtksourcelanguage-parser-2-mangled.c
moo/mooedit/gtksourceview/gtksourcelanguagemanager-mangled.c
moo/mooedit/gtksourceview/gtksourcestyle-mangled.c
moo/mooedit/gtksourceview/gtksourcestyleschememanager-mangled.c
moo/mooedit/gtksourceview/gtksourcestylescheme-mangled.c
moo/mooedit/gtksourceview/gtksourcestylescheme-noxml-mangled.c
moo/mooedit/gtksourceview/gtksourcestyleschememanager-mangled.c
moo/mooedit/gtksourceview/gtksourcecontextengine-mangled.c
moo/mooedit/gtksourceview/gtksourcelanguage-mangled.c
moo/mooedit/gtksourceview/gtksourcelanguage-parser-2-mangled.c
moo/mooedit/gtksourceview/gtksourcelanguagemanager-mangled.c
moo/mooedit/gtksourceview/gtksourcestyle-mangled.c
moo/mooedit/gtksourceview/gtksourcestylescheme-mangled.c
moo/mooedit/gtksourceview/gtksourcestyleschememanager-mangled.c

2
tests/Makefile.am
View File

@ -11,8 +11,6 @@ TESTS = run-tests
endif
AM_CFLAGS = \
-I$(top_builddir) \
-I../moo \
$(MOO_CFLAGS) \
$(MOO_DEBUG_CFLAGS)
AM_OBJCFLAGS = $(AM_CFLAGS)