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

More ugly stuff to avoid compiling with libtool

Browse Source
This commit is contained in:
Yevgen Muntyan 2008-08-23 02:34:10 -05:00
parent a146da79d3
commit 575bc60c36
19 changed files with 121 additions and 105 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
configure.ac
View File

@ -40,17 +40,16 @@ Makefile
config.py
doc/Makefile
moo/Makefile
moo/moolua/Makefile
moo/mooutils/Makefile
moo/mooutils/newgtk/Makefile
moo/moofileview/Makefile
moo/mooedit/Makefile
moo/mooedit/plugins/Makefile
moo/mooapp/Makefile
moo/mooedit/Makefile
moo/moofileview/Makefile
moo/moolua/Makefile
moo/moopython/Makefile
moo/moopython/plugins/Makefile
moo/moopython/plugins/pyproject/Makefile
moo/moopython/pygtk/Makefile
moo/mooutils/Makefile
moo/mooutils/newgtk/Makefile
moo/mooutils/pcre/Makefile
tests/pyapp.py
tests/Makefile

2
m4/moo-flags.m4
View File

@ -28,6 +28,8 @@ AC_DEFUN_ONCE([MOO_AC_PRIV_FLAGS],[
],[
:
],[-lXext])
MOO_LIBS="$MOO_LIBS $X_LIBS $X_EXTRA_LIBS -lSM -lICE"
fi
MOO_CFLAGS="$MOO_CFLAGS $MOO_PCRE_CFLAGS -DXDG_PREFIX=_moo_edit_xdg -DG_LOG_DOMAIN=\\\"Moo\\\""

1
medit/main.c
View File

@ -11,7 +11,6 @@
*/
#include <config.h>
#include "medit-credits.h"
#include "mooapp/mooapp.h"
#include "mooedit/mooplugin.h"
#include "moopython/moopython-builtin.h"

35
medit/medit-credits.h
View File

@ -1,35 +0,0 @@
/* -*- C -*- */
static const char THANKS [] = ""
"To Sveta and Max Muntyan,\n"
"\n"
"and to all who contributed, including\n"
"\n"
"Andreas Hanke\n"
"Andrey Fedoseev\n"
"Arnau Sanchez\n"
"Chaosye\n"
"Christian Dywan\n"
"Collilieux\n"
"Daniel Butzu\n"
"David Hough\n"
"Dmytro Savchuk\n"
"Everaldo Coelho\n"
"Federico Mena Quintero\n"
"Geoffrey French\n"
"Jeroen Zwartepoorte\n"
"Kenneth Prugh\n"
"LoneFox\n"
"Lontronics\n"
"Marco Barisione\n"
"Matthias Clasen\n"
"Nick Treleaven\n"
"Owen Taylor\n"
"Paolo Borelli\n"
"Paolo Maggi\n"
"Philip Hazel\n"
"Scott Wimer\n"
"Thomas Gilgin\n"
"Tim Janik\n"
"Tim-Philipp Müller\n"
"Vlastimil Ott\n"
;

2
moo.mprj
View File

@ -8,7 +8,7 @@
<debug>
<build_dir>build/debug</build_dir>
<configure>
<args>--enable-debug --enable-all-warnings --enable-project --enable-unit-tests --prefix=${PREFIX:-/usr/local}</args>
<args>--enable-debug --enable-all-warnings --enable-project --enable-pch --enable-unit-tests --prefix=${PREFIX:-/usr/local}</args>
<vars>
<var name="CC">gcc-4.2</var>
<var name="CXX">g++-4.2</var>

17
moo/moo-comps.mk
View File

@ -7,18 +7,35 @@ moo_sublibs += $(top_builddir)/moo/moopython/libmoopython.la
endif
if MOO_BUILD_APP
if MOO_INSTALL_LIB
moo_sublibs += $(top_builddir)/moo/mooapp/libmooapp.la
else
moo_sublibs += $(top_builddir)/moo/mooapp/libmooapp.a
endif
endif
if MOO_BUILD_EDIT
if MOO_INSTALL_LIB
moo_sublibs += $(top_builddir)/moo/mooedit/libmooedit.la
moo_sublibs += $(top_builddir)/moo/moofileview/libmoofileview.la
else
moo_sublibs += $(top_builddir)/moo/mooedit/libmooedit.a
moo_sublibs += $(top_builddir)/moo/moofileview/libmoofileview.a
endif
endif
if MOO_BUILD_LUA
if MOO_INSTALL_LIB
moo_sublibs += $(top_builddir)/moo/moolua/libmoolua.la
else
moo_sublibs += $(top_builddir)/moo/moolua/libmoolua.a
endif
endif
if MOO_BUILD_UTILS
if MOO_INSTALL_LIB
moo_sublibs += $(top_builddir)/moo/mooutils/libmooutils.la
else
moo_sublibs += $(top_builddir)/moo/mooutils/libmooutils.a
endif
endif

11
moo/mooapp/Makefile.ug
View File

@ -12,19 +12,20 @@ mooapp_sources = \
moolinklabel.h \
moolinklabel.c
noinst_LTLIBRARIES = libmooapp.la
libmooapp_la_SOURCES = $(mooapp_sources)
libmooapp_la_LIBADD =
libmooapp_SOURCES_ = $(mooapp_sources)
BUILT_SOURCES += mooapp-credits.h
GLADE_FILES = glade/mooappabout.glade
AM_CFLAGS = $(MOO_CFLAGS)
AM_CXXFLAGS = $(MOO_CXXFLAGS)
AM_CFLAGS_ = $(MOO_CFLAGS)
AM_CXXFLAGS_ = $(MOO_CXXFLAGS)
include smclient/Makefile.incl
mooapp-credits.h: ../../THANKS $(top_srcdir)/ugly/xml2h.sh
$(SHELL) $(top_srcdir)/ugly/xml2h.sh MOO_APP_CREDITS $(srcdir)/../../THANKS > $@.tmp && \
mv $@.tmp $(srcdir)/mooapp-credits.h
MODULE = libmooapp
UGLY_LIBS =

11
moo/mooapp/smclient/Makefile.incl
View File

@ -1,23 +1,22 @@
libmooapp_la_SOURCES += \
libmooapp_SOURCES_ += \
smclient/eggsmclient.c \
smclient/eggsmclient.h \
smclient/eggsmclient-mangle.h \
smclient/eggsmclient-private.h
if GDK_X11
AM_CFLAGS += $(X_CFLAGS) -DEGG_SM_CLIENT_BACKEND_XSMP
libmooapp_la_LIBADD += $(X_LIBS) $(X_EXTRA_LIBS) -lSM -lICE
libmooapp_la_SOURCES += \
AM_CFLAGS_ += $(X_CFLAGS) -DEGG_SM_CLIENT_BACKEND_XSMP
libmooapp_SOURCES_ += \
smclient/eggsmclient-xsmp.c \
smclient/eggdesktopfile.h \
smclient/eggdesktopfile.c
endif GDK_X11
if GDK_WIN32
libmooapp_la_SOURCES += \
libmooapp_SOURCES_ += \
smclient/eggsmclient-win32.c
endif GDK_WIN32
if GDK_QUARTZ
libmooapp_la_SOURCES += \
libmooapp_SOURCES_ += \
smclient/eggsmclient-dummy.c
endif GDK_QUARTZ

18
moo/mooedit/Makefile.ug
View File

@ -3,11 +3,7 @@ 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_SOURCES = \
$(gtksourceview_sources) \
$(mooeditplugins_sources) \
libmooedit_SOURCES_ = \
moocmdview.c \
moocmdview.h \
moocommand.c \
@ -102,8 +98,7 @@ libmooedit_la_SOURCES = \
moousertools-prefs.c \
moousertools-prefs.h
nodist_libmooedit_la_SOURCES = \
$(nodist_gtksourceview_sources)
nodist_libmooedit_SOURCES_ =
dist_printing_sources = \
mooprintpreview.h \
@ -113,7 +108,7 @@ dist_printing_sources = \
mootextprint.h
EXTRA_DIST += $(dist_printing_sources)
if GTK_2_10
libmooedit_la_SOURCES += $(dist_printing_sources)
libmooedit_SOURCES_ += $(dist_printing_sources)
endif
ENUM_MODULE = mooedit
@ -149,11 +144,14 @@ EXTRA_DIST += \
$(mooedit_tools_DATA) \
$(mooedit_lua_DATA)
AM_CFLAGS = $(MOO_CFLAGS) -I$(srcdir)/gtksourceview $(MOO_WIN32_CFLAGS)
AM_CXXFLAGS = $(MOO_CXXFLAGS) $(MOO_WIN32_CFLAGS)
AM_CFLAGS_ = $(MOO_CFLAGS) $(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
MODULE = libmooedit
UGLY_LIBS =

13
moo/mooedit/gtksourceview/Makefile.incl
View File

@ -1,3 +1,6 @@
libmooedit_SOURCES_ += $(gtksourceview_sources)
nodist_libmooedit_SOURCES_ += $(built_gtksourceview_sources)
upstream_sources = \
gtksourceview/upstream/gtksourcecontextengine.c \
gtksourceview/upstream/gtksourcecontextengine.h \
@ -65,17 +68,15 @@ gtksourceview_sources = \
gtksourceview/gtksourceview-i18n.h \
gtksourceview/gtksourceview-marshal.h \
gtksourceview/gtksourceview-api.h
nodist_gtksourceview_sources = \
$(built_gtksourceview_sources)
if MOO_USE_XML
nodist_gtksourceview_sources += $(xml_sources)
EXTRA_DIST += $(no_xml_sources)
built_gtksourceview_sources += $(xml_sources)
else
nodist_gtksourceview_sources += $(no_xml_sources)
EXTRA_DIST += $(xml_sources)
built_gtksourceview_sources += $(no_xml_sources)
endif
AM_CFLAGS_ += -I$(srcdir)/gtksourceview
EXTRA_DIST += \
gtksourceview/upstream/gtksourcecontextengine.c \
gtksourceview/upstream/gtksourceengine.c \

4
moo/mooedit/langs/Makefile.incl
View File

@ -1,5 +1,3 @@
TESTS = langs/check.sh
languagespecsdir = ${MOO_TEXT_LANG_FILES_DIR}
langs2 = \
@ -85,5 +83,5 @@ languagespecs_DATA = \
$(langs2)
EXTRA_DIST += \
$(nobase_languagespecs_DATA) \
$(languagespecs_DATA) \
langs/styles.rng

1
moo/mooedit/plugins/Makefile.incl
View File

@ -1,3 +1,4 @@
libmooedit_SOURCES_ += $(mooeditplugins_sources)
mooeditplugins_sources =
###########################################################################

10
moo/moofileview/Makefile.ug
View File

@ -54,8 +54,10 @@ GLADE_FILES = \
MOO_UI_FILES = moofileview.xml
noinst_LTLIBRARIES = libmoofileview.la
libmoofileview_la_SOURCES = $(moofileview_sources)
libmoofileview_SOURCES_ = $(moofileview_sources)
AM_CFLAGS = $(MOO_CFLAGS)
AM_CXXFLAGS = $(MOO_CXXFLAGS)
AM_CFLAGS_ = $(MOO_CFLAGS)
AM_CXXFLAGS_ = $(MOO_CXXFLAGS)
MODULE = libmoofileview
UGLY_LIBS =

9
moo/moolua/Makefile.am → moo/moolua/Makefile.ug
View File

@ -1,4 +1,5 @@
noinst_LTLIBRARIES = libmoolua.la
MODULE = libmoolua
UGLY_LIBS =
if MOO_OS_DARWIN
MOO_LUA_CFLAGS="-DLUA_USE_MACOSX"
@ -8,13 +9,13 @@ MOO_LUA_CFLAGS="-DLUA_USE_POSIX -DLUA_USE_DLOPEN"
endif
endif
AM_CFLAGS = \
AM_CFLAGS_ = \
$(MOO_CFLAGS) \
$(MOO_LUA_CFLAGS) \
$(MOO_W_NO_MISSING_NORETURN) \
-DLUA_USE_APICHECK
libmoolua_la_SOURCES = \
libmoolua_SOURCES_ = \
ext/lfs.h \
ext/lfs.c \
moolua.h \
@ -22,7 +23,7 @@ libmoolua_la_SOURCES = \
moolua-tests.h \
luaall.c
EXTRA_DIST = \
EXTRA_DIST += \
lapi.c \
lcode.c \
ldebug.c \

21
moo/mooutils/Makefile.ug
View File

@ -1,16 +1,17 @@
DIST_SUBDIRS = pcre newgtk
noinst_LTLIBRARIES =
subdirs =
libs =
if MOO_BUILD_PCRE
subdirs += pcre
# FIXME static libs
libs += pcre/libpcre.la
endif
if !GLIB_2_14
if !GLIB_2_8
subdirs += newgtk
# FIXME static libs
libs += newgtk/libnewgtk.la
endif
SUBDIRS = $(subdirs) .
@ -201,24 +202,28 @@ stock-medit.h: pixmaps/medit.png
MEDIT_ICON $(srcdir)/pixmaps/medit.png \
> $@.tmp && mv $@.tmp $@
noinst_LTLIBRARIES += libmooutils.la
libmooutils_la_SOURCES = $(mooutils_sources)
nodist_libmooutils_la_SOURCES = marshals.c
libmooutils_la_LIBADD = $(libs)
libmooutils_SOURCES_ = $(mooutils_sources)
nodist_libmooutils_SOURCES_ = marshals.c
libmooutils_LIBADD_ = $(libs)
if GDK_QUARTZ
objc_flag = "-xobjective-c"
objcxx_flag = "-xobjective-c++"
endif
AM_CFLAGS = \
AM_CFLAGS_ = \
$(MOO_CFLAGS) \
$(MOO_WIN32_CFLAGS) \
$(objc_flag)
AM_CXXFLAGS = \
AM_CXXFLAGS_ = \
$(MOO_CXXFLAGS) \
$(MOO_WIN32_CFLAGS) \
$(objcxx_flag)
include xdgmime/Makefile.incl
MODULE = libmooutils
UGLY_LIBS =
%.lo: %.o ; @true

1
ugly/lt.mk Normal file
View File

@ -0,0 +1 @@
repo/lt.mk

30
ugly/repo/lt.mk Normal file
View File

@ -0,0 +1,30 @@
# -%- lang: makefile; indent-width: 8; use-tabs: true -%-
# UGLY_MK_TRIGGER = UGLY_LIBS
noinst_LTLIBRARIES =
noinst_LIBRARIES =
if MOO_INSTALL_LIB
noinst_LTLIBRARIES += @MODULE@.la
else
noinst_LIBRARIES += @MODULE@.a
endif
@MODULE@_la_SOURCES = $(@MODULE@_SOURCES_)
@MODULE@_a_SOURCES = $(@MODULE@_SOURCES_)
nodist_@MODULE@_la_SOURCES = $(nodist_@MODULE@_SOURCES_)
nodist_@MODULE@_a_SOURCES = $(nodist_@MODULE@_SOURCES_)
@MODULE@_la_LIBADD = $(nodist_@MODULE@_LIBADD_)
@MODULE@_a_LIBADD = $(nodist_@MODULE@_LIBADD_)
@MODULE@_la_LDFLAGS = $(nodist_@MODULE@_LDFLAGS_)
AM_CFLAGS = $(AM_CFLAGS_)
@MODULE@_la_CFLAGS = $(AM_CFLAGS_)
@MODULE@_a_CFLAGS = $(AM_CFLAGS_)
AM_CXXFLAGS = $(AM_CXXFLAGS_)
@MODULE@_la_CXXFLAGS = $(AM_CXXFLAGS_)
@MODULE@_a_CXXFLAGS = $(AM_CXXFLAGS_)

9
ugly/repo/ugly
View File

@ -227,15 +227,6 @@ _EOFEOF
done
done
# if $need_all_target; then
# cat >> $out_tmp << \_EOFEOF
#
# all-local: $(UGLY_ALL_TARGETS)
# clean-local: $(UGLY_CLEAN_TARGETS)
#
# _EOFEOF
# fi
cat ugly/repo/bdist.mk >> $out_tmp
cat ugly/repo/ugly-post.mk >> $out_tmp

20
ugly/repo/ugly-pre.mk
View File

@ -19,18 +19,16 @@ UGLY_DEPS = \
$(top_srcdir)/ugly/repo/ugly-post.mk \
$(top_srcdir)/ugly/repo/bdist.mk
UGLY_ALL_TARGETS =
UGLY_CLEAN_TARGETS =
BUILT_SOURCES += ugly-pre-build-stamp
CLEANFILES += ugly-pre-build-stamp
UGLY_PRE_BUILD_TARGETS =
UGLY_CLEAN_TARGETS =
ugly-pre-build-stamp: $(UGLY_PRE_BUILD_TARGETS)
echo stamp > ugly-pre-build-stamp
@echo stamp > ugly-pre-build-stamp
clean-local: $(UGLY_CLEAN_TARGETS)
UGLY_SUBDIRS =
UGLY_PRE_BUILD_TARGETS += ugly-subdirs-stamp
CLEANFILES += ugly-pre-build-stamp
UGLY_CLEAN_TARGETS += delete-ugly-subdir-makefile
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 \
@ -38,6 +36,14 @@ ugly-subdirs-stamp: $(UGLY_SUBDIRS) Makefile $(top_srcdir)/ugly/repo/ugly-subdir
cp $(top_srcdir)/ugly/repo/ugly-subdir-Makefile $$d/Makefile || exit 1; \
done; \
fi
echo stamp > ugly-subdirs-stamp
@echo stamp > ugly-subdirs-stamp
delete-ugly-subdir-makefile:
@if test -n "$(UGLY_SUBDIRS)"; then \
for d in $(UGLY_SUBDIRS); do \
rm -f $$d/Makefile || exit 1; \
done; \
fi
CLEANFILES += ugly-pre-build-stamp ugly-subdirs-stamp
# end ugly-pre.mk