Enlightenment CVS committal
Author : kwo
Project : e16
Module : e
Dir : e16/e/src
Modified Files:
Makefile.am actions.c main.c
Removed Files:
timestamp.h
Log Message:
Various build related tweaks:
- Autogenerate spec file (now named e16.spec, was e.spec)
- Minor changes to various version strings
- Move timestamp.h to top dir.
===================================================================
RCS file: /cvs/e/e16/e/src/Makefile.am,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -3 -r1.69 -r1.70
--- Makefile.am 16 Apr 2006 21:14:47 -0000 1.69
+++ Makefile.am 17 Apr 2006 15:55:24 -0000 1.70
@@ -110,7 +110,6 @@
theme.c \
timers.c \
timers.h \
- timestamp.h \
tooltips.c \
tooltips.h \
ttfont.c \
@@ -137,7 +136,7 @@
$(E_X_LIBS) \
-lX11 -lm
-INCLUDES = -I$(top_builddir) -I$(top_srcdir)/intl @ecore_cflags@ $(ESD_CFLAGS)
$(IMLIB_CFLAGS) $(X_CFLAGS)
+INCLUDES = -I$(top_builddir) -I$(top_srcdir) -I$(top_srcdir)/intl
@ecore_cflags@ $(ESD_CFLAGS) $(IMLIB_CFLAGS) $(X_CFLAGS)
install-data-local:
$(top_srcdir)/mkinstalldirs $(DESTDIR)$(ENLIGHTENMENT_ROOT)/themes
===================================================================
RCS file: /cvs/e/e16/e/src/actions.c,v
retrieving revision 1.197
retrieving revision 1.198
diff -u -3 -r1.197 -r1.198
--- actions.c 18 Feb 2006 08:30:03 -0000 1.197
+++ actions.c 17 Apr 2006 15:55:24 -0000 1.198
@@ -289,8 +289,7 @@
}
d = DialogCreate("ABOUT_ENLIGHTENMENT");
- Esnprintf(buf, sizeof(buf),
- _("About Enlightenment %s"), ENLIGHTENMENT_VERSION);
+ Esnprintf(buf, sizeof(buf), _("About Enlightenment %s"), e_wm_version);
DialogSetTitle(d, buf);
table = DialogInitItem(d);
===================================================================
RCS file: /cvs/e/e16/e/src/main.c,v
retrieving revision 1.141
retrieving revision 1.142
diff -u -3 -r1.141 -r1.142
--- main.c 9 Apr 2006 10:18:34 -0000 1.141
+++ main.c 17 Apr 2006 15:55:24 -0000 1.142
@@ -34,12 +34,7 @@
#include <time.h>
const char e_wm_name[] = "Enlightenment";
-const char e_wm_version[] =
-#ifdef ENLIGHTENMENT_RELEASE
- "enlightenment-" ENLIGHTENMENT_VERSION "-" ENLIGHTENMENT_RELEASE;
-#else
- "enlightenment-" ENLIGHTENMENT_VERSION;
-#endif
+const char e_wm_version[] = ENLIGHTENMENT_VERSION;
const char e_wm_date[] = E_CHECKOUT_DATE;
Display *disp;
@@ -191,8 +186,7 @@
Mode.theme.path = Estrdup(eoptarg);
break;
case 'V':
- printf("Enlightenment %s - %s\n",
- ENLIGHTENMENT_VERSION, E_CHECKOUT_DATE);
+ printf("%s %s - %s\n", e_wm_name, e_wm_version, e_wm_date);
exit(0);
break;
case 'v':
@@ -237,7 +231,7 @@
ThemePathFind();
/* Set the Environment variables */
- Esetenv("EVERSION", ENLIGHTENMENT_VERSION, 1);
+ Esetenv("EVERSION", e_wm_version, 1);
Esetenv("EROOT", EDirRoot(), 1);
Esetenv("EBIN", EDirBin(), 1);
Esetenv("ECONFDIR", EDirUser(), 1);
-------------------------------------------------------
This SF.Net email is sponsored by xPML, a groundbreaking scripting language
that extends applications into web and mobile media. Attend the live webcast
and join the prime developer group breaking into this new coding territory!
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=110944&bid=241720&dat=121642
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
