Enlightenment CVS committal
Author : kwo
Project : e16
Module : e
Dir : e16/e/src
Modified Files:
Makefile.am actions.c
Log Message:
Optionally build various bits (font,sound support) as loadable modules.
===================================================================
RCS file: /cvs/e/e16/e/src/Makefile.am,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -3 -r1.92 -r1.93
--- Makefile.am 25 Aug 2007 05:38:53 -0000 1.92
+++ Makefile.am 6 Sep 2007 16:02:48 -0000 1.93
@@ -90,13 +90,11 @@
slideout.c \
snaps.c snaps.h \
sound.c sound.h \
- sound_esd.c \
stacking.c \
startup.c \
systray.c \
tclass.c tclass.h \
text.c \
- ttfont.c text_xft.c text_pango.c \
theme.c \
timers.c timers.h \
tooltips.c tooltips.h \
@@ -106,6 +104,7 @@
windowmatch.c windowmatch.h \
x.c xwin.h \
zoom.c \
+ $(MODULE_SRCS) \
$(SRCS_GNOME) \
$(SRCS_GLX) \
$(SRCS_ECOMPMGR) \
@@ -115,11 +114,9 @@
$(LTLIBINTL) \
$(LTLIBICONV) \
$(ECORE_LIBS) \
- $(ESD_LIBS) \
$(IMLIB2_LIBS) \
+ $(MODULE_LIBS) \
$(GLX_LIBS) \
- $(PANGO_LIBS) \
- $(XFT_LIBS) \
$(X_LIBS) \
$(SM_LIBS) \
$(XINERAMA_LIBS) \
@@ -129,11 +126,55 @@
INCLUDES = -I$(top_builddir) -I$(top_srcdir) \
$(ECORE_CFLAGS) \
- $(ESD_CFLAGS) \
+ $(MODULE_CFLAGS) \
$(IMLIB2_CFLAGS) \
- $(PANGO_CFLAGS) \
- $(XFT_CFLAGS) \
$(X_CFLAGS)
+
+if BUILD_MODULES
+
+e16_LDFLAGS = -export-dynamic
+
+libe16dir = $(libdir)/e16
+
+libe16_LTLIBRARIES = $(LIBSND_ESD) $(LIBFNT_IFT) $(LIBFNT_XFT) $(LIBFNT_PANGO)
+
+if USE_LIBESD
+LIBSND_ESD = libsound_esd.la
+libsound_esd_la_SOURCES = sound_esd.c
+libsound_esd_la_CFLAGS = $(ESD_CFLAGS)
+libsound_esd_la_LIBADD = $(ESD_LIBS)
+libsound_esd_la_LDFLAGS = -module -avoid-version
+endif
+
+LIBFNT_IFT = libfont_ift.la
+libfont_ift_la_SOURCES = ttfont.c
+libfont_ift_la_CFLAGS = $(IMLIB2_CFLAGS)
+libfont_ift_la_LIBADD = $(IMLIB2_LIBS)
+libfont_ift_la_LDFLAGS = -module -avoid-version
+
+if USE_LIBXFT
+LIBFNT_XFT = libfont_xft.la
+libfont_xft_la_SOURCES = text_xft.c
+libfont_xft_la_CFLAGS = $(XFT_CFLAGS)
+libfont_xft_la_LIBADD = $(XFT_LIBS)
+libfont_xft_la_LDFLAGS = -module -avoid-version
+endif
+
+if USE_LIBPANGO
+LIBFNT_PANGO = libfont_pango.la
+libfont_pango_la_SOURCES = text_pango.c
+libfont_pango_la_CFLAGS = $(PANGO_CFLAGS)
+libfont_pango_la_LIBADD = $(PANGO_LIBS) libfont_xft.la
+libfont_pango_la_LDFLAGS = -module -avoid-version
+endif
+
+else
+
+MODULE_SRCS = sound_esd.c ttfont.c text_xft.c text_pango.c
+MODULE_LIBS = $(ESD_LIBS) $(PANGO_LIBS) $(XFT_LIBS)
+MODULE_CFLAGS = $(ESD_CFLAGS) $(PANGO_CFLAGS) $(XFT_CFLAGS)
+
+endif
install-data-local:
$(top_srcdir)/mkinstalldirs $(DESTDIR)$(ENLIGHTENMENT_ROOT)/themes
===================================================================
RCS file: /cvs/e/e16/e/src/actions.c,v
retrieving revision 1.215
retrieving revision 1.216
diff -u -3 -r1.215 -r1.216
--- actions.c 15 Apr 2007 08:58:46 -0000 1.215
+++ actions.c 6 Sep 2007 16:02:48 -0000 1.216
@@ -41,7 +41,7 @@
LangExport();
#if USE_ROOTHACKLIB
if (Mode.wm.window)
- Esetenv("LD_PRELOAD", ENLIGHTENMENT_LIB "/libe16_hack.so");
+ Esetenv("LD_PRELOAD", ENLIGHTENMENT_LIB "/e16/libhack.so");
#endif
}
-------------------------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems? Stop.
Now Search log events and configuration files using AJAX and a browser.
Download your FREE copy of Splunk now >> http://get.splunk.com/
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
