Commits

Anonymous committed 4d2c92e

Fixed headers and build system for installing the library

  • Participants
  • Parent commits 56b5dbd
  • Tags moo-0.6.6

Comments (0)

Files changed (27)

+2006-04-06  Yevgen Muntyan  <muntyan@math.tamu.edu>
+
+    * === Released 0.6.6 ===
+
+    Lot of bugs fixed, lot of bugs introduced.
+
+    MooEdit:
+        Made quick search work.
+        Line ends type is detected automatically, and
+        used when saving file.
+
 2006-03-29  Yevgen Muntyan  <muntyan@math.tamu.edu>
 
-    * === Released 0.6.4 ===
-    
+    * === Released 0.6.5 ===
+
     0.6.4 is broken
 
 2006-03-29  Yevgen Muntyan  <muntyan@math.tamu.edu>
 
     MooTerm:
 	Rewritten drawing.
-	
+
     MooFileView:
 	Made it work (to some extent) on windows.
 
 
 DIST_SUBDIRS = m4
 
-# pkgconfigdir = $(libdir)/pkgconfig
-# pkgconfig_DATA = moo.pc
-
 ACLOCAL_AMFLAGS = -I m4 $(ACLOCAL_FLAGS)
 
-
 DEFAULT_INCLUDES =
-AM_CFLAGS =                                 \
-    -I$(top_builddir)                       \
-    -I$(top_srcdir)                         \
-    -I$(top_srcdir)/$(MOO_SRC_PREFIX)       \
-    -I$(top_builddir)/$(MOO_SRC_PREFIX)     \
-    $(MOO_CFLAGS)                           \
-    $(PYTHON_INCLUDES)                      \
-    $(PYGTK_CFLAGS)                         \
-    $(MOO_DEBUG_CFLAGS)                     \
+AM_CFLAGS =					\
+    -I$(top_builddir)				\
+    -I$(top_srcdir)				\
+    -I$(top_srcdir)/$(MOO_SRC_PREFIX)		\
+    -I$(top_builddir)/$(MOO_SRC_PREFIX)		\
+    -I$(top_srcdir)/$(MOO_SRC_PREFIX)/mooutils	\
+    $(MOO_CFLAGS)				\
+    $(PYTHON_INCLUDES)				\
+    $(PYGTK_CFLAGS)				\
+    $(MOO_DEBUG_CFLAGS)				\
     $(CFLAGS)
 
-if !MOO_OS_CYGWIN
-if MOO_BUILD_LIB
-# noinst_LTLIBRARIES = libmoo-1.0.la
-endif
-endif
 
 ###########################################################################
 
 include moo/moopython/pygtk/Makefile.incl
 include moo/moopython/plugins/Makefile.incl
 
-# moo_libincludedir = $(libdir)/moo-1.0/include
-# moo_libinclude_HEADERS = $(moo_libinclude_headers)
-# moo_includedir = $(includedir)/moo-1.0
-# moo_include_HEADERS = $(moo_include_headers)
-# mooedit_includedir = $(moo_includedir)/mooedit
-# mooedit_include_HEADERS = $(mooedit_include_headers)
-# mooterm_includedir = $(moo_includedir)/mooterm
-# mooterm_include_HEADERS = $(mooterm_include_headers)
-# mooapp_includedir = $(moo_includedir)/mooapp
-# mooapp_include_HEADERS = $(mooapp_include_headers)
-# mooutils_includedir = $(moo_includedir)/mooutils
-# mooutils_include_HEADERS = $(mooutils_include_headers)
+if MOO_BUILD_LIB
+moo_libinclude_HEADERS = $(moo_libinclude_headers)
+moo_include_HEADERS = $(moo_include_headers)
+mooedit_includedir = $(moo_includedir)/mooedit
+mooedit_include_HEADERS = $(mooedit_include_headers)
+mooterm_includedir = $(moo_includedir)/mooterm
+mooterm_include_HEADERS = $(mooterm_include_headers)
+mooapp_includedir = $(moo_includedir)/mooapp
+mooapp_include_HEADERS = $(mooapp_include_headers)
+mooutils_includedir = $(moo_includedir)/mooutils
+mooutils_include_HEADERS = $(mooutils_include_headers)
+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA = moo/moo.pc
+endif
+
+if MOO_OS_MINGW
+moo_sources += $(moo_win32_sources)
+moo_extra_dist += $(moo_unix_sources)
+endif
+if MOO_OS_UNIX
+moo_sources += $(moo_unix_sources)
+moo_extra_dist += $(moo_win32_sources)
+endif
 
 ###########################################################################
 
 libmoo_sources = $(moo_sources)
 nodist_libmoo_sources = $(moo_nodist_sources)
 
-if MOO_OS_MINGW
-libmoo_sources += $(moo_win32_sources)
-endif
-if MOO_OS_UNIX
-libmoo_sources += $(moo_unix_sources)
-endif
-
-
 EXTRA_DIST += $(moo_extra_dist)
 
-if MOO_OS_MINGW
-EXTRA_DIST += $(moo_unix_sources)
-else
-EXTRA_DIST += $(moo_win32_sources)
-endif
-
 
 ##############################################################################
 # tests

File configure.ac

 m4_define([moo_micro_version], [6])
 m4_define([moo_version], [moo_major_version.moo_minor_version.moo_micro_version])
 
-AC_INIT(libmoo, [moo_version], [muntyan@math.tamu.edu], libmoo)
-AM_INIT_AUTOMAKE(libmoo, [moo_version])
+AC_INIT(medit, [moo_version], [muntyan@math.tamu.edu], medit)
+AM_INIT_AUTOMAKE(medit, [moo_version])
 AC_CANONICAL_HOST
 
 AC_CONFIG_HEADERS(config.h)
 AM_CONDITIONAL(MOO_BUILD_LIB, false)
 MOO_COMPONENTS
 MOO_AC_RELOC
-MOO_AC_SET_DIRS([moo-1.0])
+MOO_AC_SET_DIRS(moo)
 MOO_AC_FLAGS
 
 
 Makefile
 moo/mooterm/termhelper_res.rc
 moo/moo.pc
+moo/moo-version.h
 tests/pyapp.py
 m4/Makefile
 ])

File m4/moo-dirs.m4

 
     MOO_TEXT_LANG_FILES_DIR="${MOO_DATA_DIR}/syntax"
     AC_SUBST(MOO_TEXT_LANG_FILES_DIR)
+
+    moo_libincludedir=${MOO_LIB_DIR}/include
+    moo_includedir=${includedir}/$1
+    AC_SUBST(moo_libincludedir)
+    AC_SUBST(moo_includedir)
 ])

File moo.kdevelop

   </kdevdoctreeview>
   <kdevfilecreate>
     <filetypes>
-      <type icon="source" ext="g" name="GAP source" create="template" >
+      <type icon="source" ext="g" create="template" name="GAP source" >
         <descr>A new empty GAP source file</descr>
       </type>
-      <type icon="source_cpp" ext="cpp" name="C++ Source" create="template" >
+      <type icon="source_cpp" ext="cpp" create="template" name="C++ Source" >
         <descr>A new empty C++ file.</descr>
       </type>
-      <type icon="source_h" ext="h" name="C/C++ Header" create="template" >
+      <type icon="source_h" ext="h" create="template" name="C/C++ Header" >
         <descr>A new empty header file for C/C++.</descr>
       </type>
-      <type icon="source_c" ext="c" name="C Source" create="template" >
+      <type icon="source_c" ext="c" create="template" name="C Source" >
         <descr>A new empty C file.</descr>
       </type>
     </filetypes>

File moo/Makefile.incl

 moo_cleanfiles =
 
 moo_include_headers =               \
-    $(moo_prefix)/moo.h
+    $(moo_prefix)/moo.h             \
+    $(moo_prefix)/moo-version.h
 
-moo_libinclude_headers =            \
-    $(moo_prefix)/moo-config.h
+# moo_libinclude_headers =            \
+#     $(moo_prefix)/moo-config.h
 
 moo_extra_dist =                    \
     $(moo_prefix)/moo.h             \

File moo/moo-version.h.in

+/*
+ *   moo-version.h
+ *
+ *   Copyright (C) 2004-2006 by Yevgen Muntyan <muntyan@math.tamu.edu>
+ *
+ *   This program is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   See COPYING file that comes with this distribution.
+ */
+
+#ifndef __MOO_VERSION_H__
+#define __MOO_VERSION_H__
+
+
+#define MOO_VERSION         @MOO_VERSION@
+#define MOO_VERSION_MAJOR   @MOO_VERSION_MAJOR@
+#define MOO_VERSION_MINOR   @MOO_VERSION_MINOR@
+#define MOO_VERSION_MICRO   @MOO_VERSION_MICRO@
+
+
+#endif /* __MOO_VERSION_H__ */
 #ifndef __MOO_H__
 #define __MOO_H__
 
+
+#include <moo-version.h>
+
+#include <mooedit/moocmdview.h>
+#include <mooedit/mooedit.h>
+#include <mooedit/mooeditconfig.h>
+#include <mooedit/mooeditor.h>
+#include <mooedit/mooeditprefs.h>
+#include <mooedit/mootextsearch.h>
+#include <mooedit/mooeditwindow.h>
+#include <mooedit/mooindenter.h>
+#include <mooedit/moolang.h>
+#include <mooedit/moolangmgr.h>
+#include <mooedit/moolinemark.h>
+#include <mooedit/moolineview.h>
+#include <mooedit/mooplugin-macro.h>
+#include <mooedit/mooplugin.h>
+#include <mooedit/mootextbuffer.h>
+#include <mooedit/mootextiter.h>
+#include <mooedit/mootextstyle.h>
+#include <mooedit/mootextstylescheme.h>
+#include <mooedit/mootextview.h>
+
+#include <mooterm/mooterm.h>
+#include <mooterm/mootermwindow.h>
+#include <mooterm/mooterm-text.h>
+#include <mooterm/mootermline.h>
+#include <mooterm/mootermtag.h>
+
 #include <mooutils/eggregex.h>
 #include <mooutils/mooaccel.h>
 #include <mooutils/mooaccelbutton.h>
 #include <mooutils/mooactiongroup.h>
 #include <mooutils/moobigpaned.h>
 #include <mooutils/mooclosure.h>
+#include <mooutils/moocmd.h>
 #include <mooutils/moocombo.h>
-#include <mooutils/moodialogs.h>
 #include <mooutils/mooentry.h>
-#include <mooutils/mooutils-misc.h>
-#include <mooutils/moofilewatch.h>
 #include <mooutils/moofiltermgr.h>
 #include <mooutils/mooglade.h>
 #include <mooutils/moohistoryentry.h>
 #include <mooutils/moohistorylist.h>
+#include <mooutils/moolinklabel.h>
 #include <mooutils/moomarkup.h>
 #include <mooutils/moomenuaction.h>
 #include <mooutils/moomenumgr.h>
+#include <mooutils/moomenutoolbutton.h>
 #include <mooutils/moonotebook.h>
 #include <mooutils/moopaned.h>
 #include <mooutils/mooprefs.h>
 #include <mooutils/mooprefsdialog.h>
 #include <mooutils/mooprefsdialogpage.h>
+#include <mooutils/moopython.h>
 #include <mooutils/moostock.h>
 #include <mooutils/mootoggleaction.h>
 #include <mooutils/moouixml.h>
+#include <mooutils/mooundomanager.h>
+#include <mooutils/moouseractions.h>
+#include <mooutils/mooutils-fs.h>
 #include <mooutils/mooutils-gobject.h>
+#include <mooutils/mooutils-misc.h>
 #include <mooutils/moowindow.h>
-#include <mooutils/moofileview/moobookmarkmgr.h>
-#include <mooutils/moofileview/moofile.h>
-#include <mooutils/moofileview/moofileentry.h>
-#include <mooutils/moofileview/moofilesystem.h>
-#include <mooutils/moofileview/moofileview.h>
-#include <mooutils/moofileview/moofoldermodel.h>
-#include <mooutils/moofileview/mooiconview.h>
 
-#include <mooedit/mooeditor.h>
-#include <mooedit/mooplugin.h>
-#include <mooedit/mootextbuffer.h>
-#include <mooedit/moocmdview.h>
-#include <mooedit/mooeditsearch.h>
-#include <mooedit/mootextiter.h>
+#include <mooscript/mooscript-context.h>
+#include <mooscript/mooscript-func.h>
+#include <mooscript/mooscript-node.h>
+#include <mooscript/mooscript-parser.h>
+#include <mooscript/mooscript-value.h>
+#include <mooscript/mooscript-zenity.h>
 
-#include <mooterm/mooterm.h>
 #include <mooapp/mooapp.h>
 
 

File moo/moo.pc.in

 datadir=@datadir@
 libdir=@libdir@
 
-langfilesdir=${datadir}/moo-1.0/syntax
-pluginsdir=${libdir}/moo-1.0/plugins
+langfilesdir=@MOO_TEXT_LANG_FILES_DIR@
+pluginsdir=@MOO_LIB_DIR@/plugins
 
-Name: libmoo
-Description: libmoo
-Requires: gtk+-2.0 @MOO_XML_PKG_NAME@ @MOO_GTHREAD_PKG_NAME@
+Name: moo
+Description: A text editor and terminal emulator library
+Requires: gtk+-2.0 @MOO_XML_PKG_NAME@
 Version: @MOO_VERSION_UNQUOTED@
-Cflags: -I${includedir}/moo-1.0 -I${libdir}/moo-1.0/include
-Libs: -L${libdir} -lmoo-1.0 @MOO_FAM_LIBS@
+Cflags: -I@moo_includedir@ -I@moo_libincludedir@
+Libs: -L${libdir} -lmoo @MOO_FAM_LIBS@ @PYTHON_LDFLAGS@

File moo/mooapp/mooapp.h

 #define __MOO_APP_H__
 
 #include <mooedit/mooeditor.h>
-#include <mooutils/moouseractions.h>
 
 G_BEGIN_DECLS
 

File moo/mooedit/Makefile.incl

 mooedit_include_headers =                     \
     $(mooedit)/moocmdview.h                   \
     $(mooedit)/mooedit.h                      \
+    $(mooedit)/mooeditconfig.h                \
     $(mooedit)/mooeditor.h                    \
     $(mooedit)/mooeditprefs.h                 \
     $(mooedit)/mootextsearch.h                \
 mooedit_noinst_headers =                      \
     $(mooedit)/gtksourceiter.h                \
     $(mooedit)/mooedit-private.h              \
-    $(mooedit)/mooeditconfig.h                \
     $(mooedit)/mooeditcolorsprefs-glade.h     \
     $(mooedit)/mooeditdialogs.h               \
     $(mooedit)/mooeditfileops.h               \

File moo/mooedit/mooeditwindow.h

 #include <mooedit/mooedit.h>
 #include <mooutils/moowindow.h>
 #include <mooutils/moobigpaned.h>
-#include <mooutils/mooscript/mooscript-context.h>
+#include <mooscript/mooscript-context.h>
 #include <gtk/gtkstatusbar.h>
 
 G_BEGIN_DECLS

File moo/mooedit/plugins/activestrings/as-plugin-script.h

 #ifndef __AS_PLUGIN_SCRIPT_H__
 #define __AS_PLUGIN_SCRIPT_H__
 
-#include "mooutils/mooscript/mooscript-context.h"
-#include "mooutils/mooscript/mooscript-node.h"
-#include "mooedit/mooedit.h"
+#include <mooscript/mooscript-context.h>
+#include <mooscript/mooscript-node.h>
+#include <mooedit/mooedit.h>
 
 G_BEGIN_DECLS
 

File moo/mooedit/plugins/activestrings/as-plugin.c

 #include "mooutils/eggregex.h"
 #include "as-plugin-script.h"
 #include "as-plugin.h"
-#include "mooutils/mooscript/mooscript-parser.h"
+#include "mooscript/mooscript-parser.h"
 #include <string.h>
 
 #define AS_PLUGIN_ID "ActiveStrings"

File moo/mooutils/Makefile.incl

     $(mooutils)/mooprefs.h                     \
     $(mooutils)/mooprefsdialog.h               \
     $(mooutils)/mooprefsdialogpage.h           \
+    $(mooutils)/moopython.h                    \
     $(mooutils)/moostock.h                     \
     $(mooutils)/mootoggleaction.h              \
     $(mooutils)/moouixml.h                     \
     $(mooutils)/mooundomanager.h               \
+    $(mooutils)/moouseractions.h               \
     $(mooutils)/mooutils-fs.h                  \
     $(mooutils)/mooutils-gobject.h             \
     $(mooutils)/mooutils-misc.h                \
     $(mooutils)/mooprefsdialog.c               \
     $(mooutils)/mooprefsdialogpage.c           \
     $(mooutils)/moopython.c                    \
-    $(mooutils)/moopython.h                    \
     $(mooutils)/moostock.c                     \
     $(mooutils)/mootoggleaction.c              \
     $(mooutils)/moouixml.c                     \
     $(mooutils)/mooundomanager.c               \
     $(mooutils)/moouseractions.c               \
-    $(mooutils)/moouseractions.h               \
     $(mooutils)/mooutils-fs.c                  \
     $(mooutils)/mooutils-gobject.c             \
     $(mooutils)/mooutils-misc.c                \

File moo/mooutils/mooscript/Makefile.incl

 $(mooscript)/mooscript-yacc.h: $(mooscript)/mooscript-yacc.y
 	bison -d -o $(mooscript_srcdir)/mooscript-yacc.c $(mooscript_srcdir)/mooscript-yacc.y
 
+mooscript_headers =                     \
+    $(mooscript)/mooscript-context.h    \
+    $(mooscript)/mooscript-func.h       \
+    $(mooscript)/mooscript-node.h       \
+    $(mooscript)/mooscript-parser.h     \
+    $(mooscript)/mooscript-value.h      \
+    $(mooscript)/mooscript-zenity.h
+
 mooscript_sources =                     \
+    $(mooscript_headers)                \
     $(mooscript)/mooscript-builtin.c    \
     $(mooscript)/mooscript-context.c    \
-    $(mooscript)/mooscript-context.h    \
     $(mooscript)/mooscript-func.c       \
-    $(mooscript)/mooscript-func.h       \
     $(mooscript)/mooscript-node.c       \
-    $(mooscript)/mooscript-node.h       \
     $(mooscript)/mooscript-parser.c     \
-    $(mooscript)/mooscript-parser.h     \
     $(mooscript)/mooscript-parser-priv.h\
     $(mooscript)/mooscript-value.c      \
-    $(mooscript)/mooscript-value.h      \
     $(mooscript)/mooscript-yacc.c       \
     $(mooscript)/mooscript-yacc.h       \
-    $(mooscript)/mooscript-zenity.c     \
-    $(mooscript)/mooscript-zenity.h
+    $(mooscript)/mooscript-zenity.c
 
 mooscript_built_sources =               \
     $(mooscript)/mooscript-yacc.c       \

File moo/mooutils/mooscript/mooscript-context.h

 #ifndef __MOO_SCRIPT_CONTEXT_H__
 #define __MOO_SCRIPT_CONTEXT_H__
 
-#include "mooscript-func.h"
+#include <mooscript/mooscript-func.h>
 #include <mooutils/moopython.h>
 
 G_BEGIN_DECLS

File moo/mooutils/mooscript/mooscript-func.h

 #ifndef __MOO_SCRIPT_FUNC_H__
 #define __MOO_SCRIPT_FUNC_H__
 
-#include "mooscript-value.h"
+#include <mooscript/mooscript-value.h>
 
 G_BEGIN_DECLS
 

File moo/mooutils/mooscript/mooscript-node.h

 #ifndef __MOO_SCRIPT_NODE_H__
 #define __MOO_SCRIPT_NODE_H__
 
-#include "mooscript-func.h"
+#include <mooscript/mooscript-func.h>
 
 G_BEGIN_DECLS
 

File moo/mooutils/mooscript/mooscript-parser.h

 #ifndef __MOO_SCRIPT_PARSER_H__
 #define __MOO_SCRIPT_PARSER_H__
 
-#include "mooscript-node.h"
-#include "mooscript-context.h"
+#include <mooscript/mooscript-node.h>
+#include <mooscript/mooscript-context.h>
 
 G_BEGIN_DECLS
 

File moo/mooutils/mooscript/mooscript-zenity.h

 #ifndef __MOO_SCRIPT_ZENITY_H__
 #define __MOO_SCRIPT_ZENITY_H__
 
-#include "mooscript-func.h"
+#include <mooscript/mooscript-func.h>
 
 G_BEGIN_DECLS
 

File moo/mooutils/moouseractions.c

  */
 
 #include "mooutils/moouseractions.h"
-#include "mooutils/mooscript/mooscript-parser.h"
+#include "mooscript/mooscript-parser.h"
 #include "mooutils/moocompat.h"
 #include <string.h>
 

File moo/mooutils/moouseractions.h

 #ifndef __MOO_USER_ACTIONS_H__
 #define __MOO_USER_ACTIONS_H__
 
-#include <mooutils/mooscript/mooscript-context.h>
+#include <mooscript/mooscript-context.h>
 #include <mooutils/moowindow.h>
 
 G_BEGIN_DECLS

File tests/Makefile.incl

 endif
 endif
 
+if !MOO_BUILD_LIB
 bin_PROGRAMS += $(medit)
+else
+noinst_PROGRAMS += $(medit)
+endif
 
 
 ldflags = -export-dynamic
     $(PYTHON_EXTRA_LIBS)
 
 if MOO_BUILD_LIB
-ldadd += libmoo-1.0.la
+ldadd += libmoo.la
 endif
 
 if MOO_OS_MINGW
 nodist_testpanedfileview_SOURCES = $(libmoo_sources) $(nodist_libmoo_sources)
 nodist_testobject_SOURCES = $(libmoo_sources) $(nodist_libmoo_sources)
 endif
-
-#####################################################################
-# Quick hack to get the module
-moo.so: medit
-	gcc *.o $(medit_LDFLAGS) $(medit_LDADD) -shared -o moo.so

File tests/medit-app.c

  *   See COPYING file that comes with this distribution.
  */
 
-#include "config.h"
 #include "medit-ui.h"
 #include <mooapp/mooapp.h>
 #include <mooutils/mooutils-fs.h>
 #include <mooutils/mooutils-misc.h>
+#include <moo-version.h>
 #include <gtk/gtk.h>
 #include <stdlib.h>
 #include <string.h>

File tests/medit-app.opag

  *   See COPYING file that comes with this distribution.
  */
 
-#include "config.h"
 #include "medit-ui.h"
 #include <mooapp/mooapp.h>
 #include <mooutils/mooutils-fs.h>
 #include <mooutils/mooutils-misc.h>
+#include <moo-version.h>
 #include <gtk/gtk.h>
 #include <stdlib.h>
 #include <string.h>

File tests/mscript.c

  *   See COPYING file that comes with this distribution.
  */
 
-#include "mooutils/mooscript/mooscript-parser.h"
+#include "mooscript/mooscript-parser.h"
 #include <gtk/gtk.h>
 #include <string.h>
 #include <stdlib.h>