Enlightenment CVS committal
Author : kwo
Project : e16
Module : e
Dir : e16/e/src
Modified Files:
Tag: branch-exp
Makefile.am mod-misc.c
Log Message:
Fix things when composite is not available/enabled. Cleanups.
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/Makefile.am,v
retrieving revision 1.43.2.19
retrieving revision 1.43.2.20
diff -u -3 -r1.43.2.19 -r1.43.2.20
--- Makefile.am 26 Sep 2004 20:09:50 -0000 1.43.2.19
+++ Makefile.am 27 Sep 2004 22:09:24 -0000 1.43.2.20
@@ -1,6 +1,6 @@
SUBDIRS =
-EXTRA_DIST = ewmh.c gnome.c snprintf.c
+EXTRA_DIST = ewmh.c gnome.c ecompmgr.c snprintf.c
bin_PROGRAMS = enlightenment
@@ -8,10 +8,13 @@
SRCS_EWMH = ewmh.c
endif
if ENABLE_GNOME
-SRCS_GNOME = gnome.c
+SRCS_GNOME = gnome.c
endif
if USE_ESNPRINTF
-SRCS_SNPRINTF = snprintf.c
+SRCS_SNPRINTF = snprintf.c
+endif
+if HAS_COMPOSITE
+SRCS_ECOMPMGR = ecompmgr.c
endif
enlightenment_SOURCES = \
E.h \
@@ -38,7 +41,6 @@
dialog.c \
dock.c \
draw.c \
- ecompmgr.c \
econfig.c \
ecore-e16.c \
edge.c \
@@ -98,6 +100,7 @@
x.c \
zoom.c \
$(SRCS_EWMH) $(SRCS_GNOME) \
+ $(SRCS_ECOMPMGR) \
$(SRCS_SNPRINTF)
@@ -109,7 +112,6 @@
$(TTF_LIBS) \
$(ESD_LIBS) \
$(IMLIB_LIBS) \
- $(DL_LIBS) \
$(X_PRE_LIBS) \
$(X_LIBS) \
$(X_EXTRA_LIBS) \
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/Attic/mod-misc.c,v
retrieving revision 1.1.2.18
retrieving revision 1.1.2.19
diff -u -3 -r1.1.2.18 -r1.1.2.19
--- mod-misc.c 26 Sep 2004 20:09:51 -0000 1.1.2.18
+++ mod-misc.c 27 Sep 2004 22:09:24 -0000 1.1.2.19
@@ -30,7 +30,9 @@
extern EModule ModAclass;
extern EModule ModBackgrounds;
extern EModule ModButtons;
+#if USE_COMPOSITE
extern EModule ModCompMgr;
+#endif
extern EModule ModCursors;
extern EModule ModDesktops;
extern EModule ModEffects;
@@ -53,7 +55,9 @@
&ModAclass,
&ModBackgrounds,
&ModButtons,
+#if USE_COMPOSITE
&ModCompMgr,
+#endif
&ModCursors,
&ModDesktops,
&ModEwins,
-------------------------------------------------------
This SF.Net email is sponsored by: YOU BE THE JUDGE. Be one of 170
Project Admins to receive an Apple iPod Mini FREE for your judgement on
who ports your project to Linux PPC the best. Sponsored by IBM.
Deadline: Sept. 24. Go here: http://sf.net/ppc_contest.php
_______________________________________________
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
