E CVS: apps/e boris

[<enl...@li...>]

Enlightenment CVS committal

Author  : boris
Project : e17
Module  : apps/e

Dir     : e17/apps/e/src


Modified Files:
	Makefile.am main.c menubuild.c 


Log Message:
no need for ferite. fun.

===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/Makefile.am,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -3 -r1.26 -r1.27
--- Makefile.am	2001/08/25 21:59:31	1.26
+++ Makefile.am	2001/08/31 13:10:26	1.27
@@ -8,6 +8,14 @@
 
 bin_PROGRAMS = enlightenment
 
+if USE_FERITE
+ferite_c = e_ferite_gen_core.c \
+	e_ferite_gen_header.h \
+	e_ferite_gen_e.c \
+	e_ferite_gen_Window.c \
+	e_ferite.h e_ferite.c
+endif
+
 enlightenment_SOURCES = \
 	actions.h actions.c \
 	background.h background.c \
@@ -16,12 +24,8 @@
 	desktops.h desktops.c \
 	entry.h entry.c \
 	exec.h exec.c \
-	e_ferite_gen_core.c \
-	e_ferite_gen_header.h \
-	e_ferite_gen_e.c \
-	e_ferite_gen_Window.c \
-	e_ferite.h e_ferite.c \
 	fs.h fs.c \
+	$(ferite_c) \
 	icccm.h icccm.c \
 	icons.c \
 	ipc.h ipc.c \
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/main.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -3 -r1.18 -r1.19
--- main.c	2001/08/25 19:51:48	1.18
+++ main.c	2001/08/31 13:10:26	1.19
@@ -9,7 +9,11 @@
 #include "ipc.h"
 #include "menu.h"
 #include "view.h"
-#include "e_ferite.h"
+
+#ifdef USE_FERITE
+# include "e_ferite.h"
+#endif
+
 #include <X11/Xproto.h>
 
 #ifdef E_PROF
@@ -123,13 +127,18 @@
    e_view_init();
    e_entry_init();
    e_keys_init();
+   
+#ifdef USE_FERITE
    e_ferite_init();
+#endif
    
    setup();
    
    e_event_loop();
 
+#ifdef USE_FERITE
    e_ferite_deinit();
+#endif
    
    return 0;
    UN(argc);
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/menubuild.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- menubuild.c	2001/08/25 19:51:48	1.4
+++ menubuild.c	2001/08/31 13:10:26	1.5
@@ -2,8 +2,11 @@
 #include "menubuild.h"
 #include "exec.h"
 #include "util.h"
-#include "e_ferite.h"
 
+#ifdef USE_FERITE
+# include "e_ferite.h"
+#endif
+
 Evas_List build_menus = NULL;
 
 static void e_build_menu_cb_exec(E_Menu *m, E_Menu_Item *mi, void *data);
@@ -33,12 +36,18 @@
 e_build_menu_cb_script(E_Menu *m, E_Menu_Item *mi, void *data)
 {
    char *script;
-   
+
+#ifdef USE_FERITE
    script = data;
    e_ferite_run(script);
+#else
+   printf( "No cookies for you. You will have to install ferite.\n" );
+#endif
+   
    return;
    UN(m);
    UN(mi);
+   UN(script);
 }
 
 static void