Even less libtool libraries

master
Yevgen Muntyan 2008-08-23 00:50:12 -05:00
parent 958a8fb753
commit d242646cbd
17 changed files with 151 additions and 125 deletions

View File

@ -1,60 +1,55 @@
DIST_SUBDIRS = plugins
SUBDIRS = plugins .
mooedit_toolsdir = $(MOO_DATA_DIR)
mooedit_tools_DATA = context.cfg menu.cfg filters.xml
mooedit_luadir = $(MOO_DATA_DIR)/lua
mooedit_lua_DATA = medit.lua
noinst_LTLIBRARIES = libmooedit.la
libmooedit_la_LIBADD = \
plugins/libmooeditplugins.la \
libgtksourceview.la
libmooedit_la_SOURCES = \
$(moocommand_stuff) \
moocommand-lua.c \
moocommand-lua.h \
mooedit-lua-api.c \
mooedit-lua.c \
mooedit-lua.h \
$(gtksourceview_sources) \
$(mooeditplugins_sources) \
moocmdview.c \
moocmdview.h \
moocommand-exe.c \
moocommand-exe.h \
moocommand-private.h \
moocommand.c \
moocommand.h \
moocommanddisplay.c \
moocommanddisplay.h \
moocommand-exe.c \
moocommand-exe.h \
moocommand.h \
moocommand-lua.c \
moocommand-lua.h \
moocommand-private.h \
mooedit-accels.h \
mooedit-bookmarks.c \
mooedit-bookmarks.h \
mooedit-enums.c \
mooedit-enums.h \
mooedit-private.h \
mooedit-tests.h \
mooedit.c \
mooedit.h \
mooeditaction.c \
mooeditaction-factory.c \
mooeditaction-factory.h \
mooeditaction.c \
mooeditaction.h \
mooedit-bookmarks.c \
mooedit-bookmarks.h \
mooedit.c \
mooeditconfig.c \
mooeditconfig.h \
mooeditdialogs.c \
mooeditdialogs.h \
mooedit-enums.c \
mooedit-enums.h \
mooeditfileops.c \
mooeditfileops.h \
mooeditfiltersettings.c \
mooeditfiltersettings.h \
mooedit.h \
mooeditinput.c \
mooeditor-private.h \
mooedit-lua-api.c \
mooedit-lua.c \
mooedit-lua.h \
mooeditor.c \
mooeditor.h \
mooeditor-private.h \
mooeditprefs.c \
mooeditprefs.h \
mooeditprefspage.c \
mooedit-private.h \
mooedit-tests.h \
mooeditwindow.c \
mooeditwindow.h \
moofold.c \
@ -63,12 +58,12 @@ libmooedit_la_SOURCES = \
mooindenter.h \
mookeyfile.c \
mookeyfile.h \
moolang-private.h \
moolang.c \
moolang.h \
moolangmgr-private.h \
moolangmgr.c \
moolangmgr.h \
moolangmgr-private.h \
moolang-private.h \
moolinebuffer.c \
moolinebuffer.h \
moolinemark.c \
@ -79,12 +74,11 @@ libmooedit_la_SOURCES = \
moooutputfilter.h \
moooutputfilterregex.c \
moooutputfilterregex.h \
mooplugin.c \
mooplugin.h \
mooplugin-loader.c \
mooplugin-loader.h \
mooplugin-macro.h \
mooplugin.c \
mooplugin.h \
mootext-private.h \
mootextbox.c \
mootextbox.h \
mootextbtree.c \
@ -94,18 +88,22 @@ libmooedit_la_SOURCES = \
mootextfind.c \
mootextfind.h \
mootextiter.h \
mootextsearch-private.h \
mootext-private.h \
mootextsearch.c \
mootextsearch.h \
mootextsearch-private.h \
mootextstylescheme.c \
mootextstylescheme.h \
mootextview-private.h \
mootextview.c \
mootextview.h \
moousertools-prefs.c \
moousertools-prefs.h \
mootextview-private.h \
moousertools.c \
moousertools.h
moousertools.h \
moousertools-prefs.c \
moousertools-prefs.h
nodist_libmooedit_la_SOURCES = \
$(nodist_gtksourceview_sources)
dist_printing_sources = \
mooprintpreview.h \
@ -151,10 +149,11 @@ EXTRA_DIST += \
$(mooedit_tools_DATA) \
$(mooedit_lua_DATA)
AM_CFLAGS = $(MOO_CFLAGS) $(MOO_WIN32_CFLAGS)
AM_CFLAGS = $(MOO_CFLAGS) -I$(srcdir)/gtksourceview $(MOO_WIN32_CFLAGS)
AM_CXXFLAGS = $(MOO_CXXFLAGS) $(MOO_WIN32_CFLAGS)
include gtksourceview/Makefile.incl
include langs/Makefile.incl
include plugins/Makefile.incl
%-private.lo: %.lo ; @true

View File

@ -1,9 +1,3 @@
noinst_LTLIBRARIES += libgtksourceview.la
libgtksourceview_la_CFLAGS = \
-I$(srcdir)/gtksourceview \
$(MOO_CFLAGS)
upstream_sources = \
gtksourceview/upstream/gtksourcecontextengine.c \
gtksourceview/upstream/gtksourcecontextengine.h \
@ -32,7 +26,7 @@ upstream_sources = \
gtksourceview/upstream/gtktextregion.c \
gtksourceview/upstream/gtktextregion.h
gtksourceview_sources = \
built_gtksourceview_sources = \
gtksourceview/gtksourcecontextengine-mangled.c \
gtksourceview/gtksourcecontextengine-mangled.h \
gtksourceview/gtksourceengine-mangled.c \
@ -64,21 +58,21 @@ no_xml_sources = \
gtksourceview/gtksourcelanguage-noxml-mangled.c \
gtksourceview/gtksourcestylescheme-noxml-mangled.c
BUILT_SOURCES += $(xml_sources) $(no_xml_sources) $(gtksourceview_sources)
CLEANFILES += $(xml_sources) $(no_xml_sources) $(gtksourceview_sources)
BUILT_SOURCES += $(xml_sources) $(no_xml_sources) $(built_gtksourceview_sources)
CLEANFILES += $(xml_sources) $(no_xml_sources) $(built_gtksourceview_sources)
libgtksourceview_la_SOURCES = \
gtksourceview_sources = \
gtksourceview/gtksourceview-i18n.h \
gtksourceview/gtksourceview-marshal.h \
gtksourceview/gtksourceview-api.h
nodist_libgtksourceview_la_SOURCES = \
$(gtksourceview_sources)
nodist_gtksourceview_sources = \
$(built_gtksourceview_sources)
if MOO_USE_XML
nodist_libgtksourceview_la_SOURCES += $(xml_sources)
nodist_gtksourceview_sources += $(xml_sources)
EXTRA_DIST += $(no_xml_sources)
else
nodist_libgtksourceview_la_SOURCES += $(no_xml_sources)
nodist_gtksourceview_sources += $(no_xml_sources)
EXTRA_DIST += $(xml_sources)
endif

View File

@ -0,0 +1,48 @@
mooeditplugins_sources =
###########################################################################
# ctags
#
ctags_sources = \
plugins/ctags/readtags.c \
plugins/ctags/readtags.h \
plugins/ctags/readtags-mangle.h \
plugins/ctags/ctags-plugin.c \
plugins/ctags/ctags-doc.c \
plugins/ctags/ctags-doc.h \
plugins/ctags/ctags-view.c \
plugins/ctags/ctags-view.h
if MOO_BUILD_CTAGS
mooeditplugins_sources += $(ctags_sources)
else
EXTRA_DIST += $(ctags_sources)
endif
###########################################################################
# fileselector
#
GLADE_FILES += \
plugins/moofileselector.glade \
plugins/moofileselector-prefs.glade
mooeditplugins_sources += \
plugins/moofileselector-prefs.c \
plugins/moofileselector.c \
plugins/moofileselector.h
###########################################################################
# libmooeditplugins
#
mooeditplugins_sources += \
plugins/mooeditplugins.h \
plugins/moofilelist.c \
plugins/moofind.c
GLADE_FILES += \
plugins/moofind.glade
EXTRA_DIST += \
plugins/moofind.c

View File

@ -1,52 +0,0 @@
noinst_LTLIBRARIES = libmooeditplugins.la
libmooeditplugins_la_SOURCES =
AM_CFLAGS = -I.. $(MOO_CFLAGS)
AM_CXXFLAGS = -I.. $(MOO_CXXFLAGS)
###########################################################################
# ctags
#
ctags_sources = \
ctags/readtags.c \
ctags/readtags.h \
ctags/readtags-mangle.h \
ctags/ctags-plugin.c \
ctags/ctags-doc.c \
ctags/ctags-doc.h \
ctags/ctags-view.c \
ctags/ctags-view.h
if MOO_BUILD_CTAGS
libmooeditplugins_la_SOURCES += $(ctags_sources)
else
EXTRA_DIST += $(ctags_sources)
endif
###########################################################################
# fileselector
#
GLADE_FILES = \
moofileselector.glade \
moofileselector-prefs.glade
libmooeditplugins_la_SOURCES += \
moofileselector-prefs.c \
moofileselector.c \
moofileselector.h
###########################################################################
# libmooeditplugins
#
libmooeditplugins_la_SOURCES += \
mooeditplugins.h \
moofilelist.c \
moofind.c
GLADE_FILES += moofind.glade
EXTRA_DIST += \
moofind.c

View File

@ -11,7 +11,7 @@
*/
#include "moofileselector.h"
#include "moofileselector-prefs-glade.h"
#include "plugins/moofileselector-prefs-glade.h"
#include "mooutils/mooprefsdialogpage.h"
#include "mooutils/mooutils-treeview.h"
#include "mooutils/mooi18n.h"

View File

@ -19,7 +19,7 @@
#include "moofileview/moobookmarkmgr.h"
#include "moofileview/moofileview-tools.h"
#include "mooeditplugins.h"
#include "moofileselector-glade.h"
#include "plugins/moofileselector-glade.h"
#include "marshals.h"
#include "mooutils/moostock.h"
#include "mooutils/mooutils-fs.h"

View File

@ -18,7 +18,7 @@
#endif
#include "mooedit/mooplugin-macro.h"
#include "moofind-glade.h"
#include "plugins/moofind-glade.h"
#include "mooedit/plugins/mooeditplugins.h"
#include "moofileview/moofileentry.h"
#include "mooedit/moocmdview.h"
@ -550,7 +550,7 @@ get_directory (MooGladeXML *xml)
if (dir)
{
moo_history_list_add (moo_history_combo_get_list (combo),
moo_history_list_add (moo_history_combo_get_list (combo),
gtk_entry_get_text (GTK_ENTRY (entry)));
/* trailing slash is no-no on windows */
norm_dir = _moo_normalize_file_path (dir);

View File

@ -2,8 +2,7 @@ DIST_SUBDIRS = pcre newgtk
noinst_LTLIBRARIES =
subdirs =
libs = libxdgmime.la
include xdgmime/Makefile.incl
libs =
if MOO_BUILD_PCRE
subdirs += pcre
@ -221,3 +220,5 @@ AM_CXXFLAGS = \
$(MOO_CXXFLAGS) \
$(MOO_WIN32_CFLAGS) \
$(objcxx_flag)
include xdgmime/Makefile.incl

View File

@ -1,6 +1,4 @@
noinst_LTLIBRARIES += libxdgmime.la
libxdgmime_la_SOURCES = \
mooutils_sources += \
xdgmime/xdgmimealias.c \
xdgmime/xdgmimealias.h \
xdgmime/xdgmime.c \
@ -17,11 +15,7 @@ libxdgmime_la_SOURCES = \
xdgmime/xdgmimeparent.c \
xdgmime/xdgmimeparent.h
libxdgmime_la_CFLAGS = \
$(MOO_CFLAGS) \
$(MOO_W_NO_SIGN_COMPARE)\
$(MOO_W_NO_UNUSED)
EXTRA_DIST += \
xdgmime/README
if MOO_OS_MINGW
libxdgmime_la_CFLAGS += -DHAVE_MMAP $(MOO_WIN32_CFLAGS)
endif
UGLY_SUBDIRS += xdgmime

View File

@ -81,6 +81,10 @@ const char *_xdg_get_base_name (const char *file_name);
#include <errno.h>
#include "mooutils/mooutils-misc.h"
#ifdef G_OS_WIN32
#define HAVE_MMAP 1
#endif
#ifdef __MINGW32__
#if __MINGW32_MAJOR_VERSION == 3 && __MINGW32_MINOR_VERSION <= 7
#include "mooutils/moowin32/ms/sys/time.h"

1
ugly/glade2h.sh Normal file
View File

@ -0,0 +1 @@
repo/glade2h.sh

View File

@ -1,16 +1,20 @@
# -%- lang: makefile; indent-width: 8; use-tabs: true -%-
# UGLY_MK_TRIGGER = GLADE_FILES
ugly_glade2h = $(top_srcdir)/ugly/glade2h.sh
ugly_xml2h = $(top_srcdir)/ugly/xml2h.sh
ugly_glade_mk = $(top_srcdir)/ugly/glade.mk
%-glade.h: glade/%.glade $(ugly_xml2h)
$(SHELL) $(ugly_xml2h) `basename "$*" | sed -e "s/-/_/"`_glade_xml $< > $@.tmp && mv $@.tmp $@
%-glade.h: %.glade $(ugly_xml2h)
$(SHELL) $(ugly_xml2h) `basename "$*" | sed -e "s/-/_/"`_glade_xml $< > $@.tmp && mv $@.tmp $@
%-glade.h: glade/%.glade $(ugly_xml2h) $(ugly_glade2h) $(ugly_glade_mk)
@mkdir -p `dirname $@`
$(ugly_glade2h) $< > $@.tmp && mv $@.tmp $@
%-glade.h: %.glade $(ugly_xml2h) $(ugly_glade2h) $(ugly_glade_mk)
@mkdir -p `dirname $@`
$(ugly_glade2h) $< > $@.tmp && mv $@.tmp $@
ugly_glade_sources_1 = $(GLADE_FILES:%.glade=%-glade.h)
ugly_glade_sources = $(ugly_glade_sources_1:glade/%-glade.h=%-glade.h)
BUILT_SOURCES += $(ugly_glade_sources)
CLEANFILES += $(ugly_glade_sources)
EXTRA_DIST += $(GLADE_FILES) $(ugly_xml2h)
EXTRA_DIST += $(GLADE_FILES) $(ugly_xml2h) $(ugly_glade2h)

10
ugly/repo/glade2h.sh Normal file
View File

@ -0,0 +1,10 @@
#! /bin/sh
xml2h="`dirname $0`/xml2h.sh"
base=`basename "$1" .glade | sed -e "s/-/_/"`
BASE=`echo $base | tr '[a-z]' '[A-Z]'`
echo "#ifndef ${BASE}_GLADE_H"
echo "#define ${BASE}_GLADE_H"
"$xml2h" "${base}_glade_xml" "$1" || exit 0
echo "#endif /* ${BASE}_GLADE_H */"

View File

@ -22,4 +22,22 @@ UGLY_DEPS = \
UGLY_ALL_TARGETS =
UGLY_CLEAN_TARGETS =
BUILT_SOURCES += ugly-pre-build-stamp
CLEANFILES += ugly-pre-build-stamp
UGLY_PRE_BUILD_TARGETS =
ugly-pre-build-stamp: $(UGLY_PRE_BUILD_TARGETS)
echo stamp > ugly-pre-build-stamp
UGLY_SUBDIRS =
UGLY_PRE_BUILD_TARGETS += ugly-subdirs-stamp
CLEANFILES += ugly-pre-build-stamp
ugly-subdirs-stamp: $(UGLY_SUBDIRS) Makefile $(top_srcdir)/ugly/repo/ugly-subdir-Makefile
@if test -n "$(UGLY_SUBDIRS)"; then \
for d in $(UGLY_SUBDIRS); do \
mkdir -p $$d || exit 1; \
cp $(top_srcdir)/ugly/repo/ugly-subdir-Makefile $$d/Makefile || exit 1; \
done; \
fi
echo stamp > ugly-subdirs-stamp
# end ugly-pre.mk

View File

@ -0,0 +1,2 @@
%.lo %.o:
cd .. && make $@

View File

@ -7,7 +7,8 @@ EXTRA_DIST += \
ugly/repo/ugly-pre.mk \
ugly/repo/ugly-post.mk \
ugly/repo/bdist.mk \
ugly/repo/bdist-top.mk
ugly/repo/bdist-top.mk \
ugly/repo/ugly-subdir-Makefile
UGLY_DEPS += \
ugly/repo/bdist-top.mk \

View File

@ -1,3 +1,5 @@
#! /bin/sh
define=false
while true; do