qemacs-commit
[Top][All Lists]
Advanced
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Qemacs-commit] qemacs Makefile configure qe-doc.html qe-doc.te...

From: Charlie Gordon
Subject: [Qemacs-commit] qemacs Makefile configure qe-doc.html qe-doc.te...
Date: Thu, 20 Dec 2007 21:37:35 +0000 
CVSROOT:        /cvsroot/qemacs
Module name:    qemacs
Changes by:     Charlie Gordon <chqrlie>        07/12/20 21:37:35

Modified files:
        .              : Makefile configure qe-doc.html qe-doc.texi qe.c 
                         unicode_join.c 

Log message:
        fixed configure and Makefile for tiny build
        updated statistics in qe-doc (sadly, sizes have increased substantially)

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/qemacs/Makefile?cvsroot=qemacs&r1=1.22&r2=1.23
http://cvs.savannah.gnu.org/viewcvs/qemacs/configure?cvsroot=qemacs&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/qemacs/qe-doc.html?cvsroot=qemacs&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/qemacs/qe-doc.texi?cvsroot=qemacs&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/qemacs/qe.c?cvsroot=qemacs&r1=1.45&r2=1.46
http://cvs.savannah.gnu.org/viewcvs/qemacs/unicode_join.c?cvsroot=qemacs&r1=1.9&r2=1.10

Patches:
Index: Makefile
===================================================================
RCS file: /cvsroot/qemacs/qemacs/Makefile,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -b -r1.22 -r1.23
--- Makefile    20 Dec 2007 20:35:20 -0000      1.22
+++ Makefile    20 Dec 2007 21:37:34 -0000      1.23
@@ -72,38 +72,22 @@
 # do not modify after this
 
 ifdef CONFIG_TINY
-CONFIG_X11=
 CONFIG_ALL_MODES=
 CONFIG_UNICODE_JOIN=
-CONFIG_ALL_KMAPS=
-CONFIG_HTML=
-CONFIG_DOCBOOK=
-CONFIG_DLL=
 endif
 
-ifdef CONFIG_WIN32
-CONFIG_ALL_KMAPS=
-CONFIG_X11=
-CONFIG_DLL=
-EXE=.exe
+ifdef CONFIG_ALL_MODES
+DEFINES+= -DCONFIG_ALL_MODES
 endif
 
 ifdef CONFIG_PNG_OUTPUT
 HTMLTOPPM_LIBS+= -lpng
 endif
 
-ifdef CONFIG_ALL_KMAPS
-DEFINES+= -DCONFIG_ALL_KMAPS
-endif
-
 ifdef CONFIG_UNICODE_JOIN
 DEFINES+= -DCONFIG_UNICODE_JOIN
 endif
 
-ifdef CONFIG_ALL_MODES
-DEFINES+= -DCONFIG_ALL_MODES
-endif
-
 ifdef CONFIG_DLL
 LIBS+=-ldl
 # export some qemacs symbols
@@ -124,7 +108,7 @@
 
 # more charsets if needed
 ifndef CONFIG_TINY
-OBJS+=charsetjis.o charsetmore.o
+OBJS+= charsetjis.o charsetmore.o
 endif
 
 ifdef CONFIG_ALL_MODES
@@ -201,20 +185,13 @@
 ffplay$(EXE): qe$(EXE) Makefile
        ln -sf $< $@
 
-qe.o: qe.c qe.h qfribidi.h qeconfig.h
-
-charset.o: charset.c qe.h
-charsetjis.o: charsetjis.c qe.h charsetjis.def
-charsetmore.o: charsetmore.c qe.h
-
-buffer.o: buffer.c qe.h
-tty.o: tty.c qe.h
-qfribidi.o: qfribidi.c qfribidi.h
 cfb.o: cfb.c cfb.h fbfrender.h
+charsetjis.o: charsetjis.c charsetjis.def
 fbfrender.o: fbfrender.c fbfrender.h libfbf.h
-html2png.o: html2png.c qe.h
+qe.o: qe.c qe.h qfribidi.h qeconfig.h
+qfribidi.o: qfribidi.c qfribidi.h
 
-%.o: %.c qe.h qestyles.h Makefile
+%.o: %.c qe.h qestyles.h config.h config.mak Makefile
        $(CC) $(DEFINES) $(CFLAGS) -o $@ -c $<
 
 clean:

Index: configure
===================================================================
RCS file: /cvsroot/qemacs/qemacs/configure,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- configure   24 Apr 2006 11:58:17 -0000      1.7
+++ configure   20 Dec 2007 21:37:34 -0000      1.8
@@ -59,6 +59,7 @@
 html="no"
 plugins="yes"
 initcalls="yes"
+kmaps="yes"
 exe=""
 
 # OS specific
@@ -205,6 +206,9 @@
     cross_prefix="i386-mingw32msvc-"
     network="no"
     exe=".exe"
+    x11="no"
+    plugins="no"
+    kmaps="no"
 fi
 
 if test "$cygwin" = "yes" ; then
@@ -271,6 +275,12 @@
 if test "$tiny" = "yes" ; then
     x11="no"
     ffmpeg="no"
+    xv="no"
+    xrender="no"
+    png="no"
+    html="no"
+    plugins="no"
+    kmaps="no"
 fi
 
 if test -z "$CFLAGS"; then
@@ -340,6 +350,7 @@
 echo "Graphical HTML   $html"
 echo "Plugins support  $plugins"
 echo "Initcall support $initcalls"
+echo "All kmaps        $kmaps"
 echo "FFMPEG support   $ffmpeg"
 
 echo "Creating config.mak and config.h"
@@ -453,6 +464,11 @@
   echo "FFMPEG_LIBDIR=$ffmpeg_libdir" >> config.mak
 fi
 
+if test "$kmaps" = "yes" ; then
+  echo "#define CONFIG_ALL_KMAPS 1" >> $TMPH
+  echo "CONFIG_ALL_KMAPS=yes" >> config.mak
+fi
+
 # build tree in object directory if source path is different from current one
 if test "$source_path_used" = "yes" ; then
     DIRS="tests"

Index: qe-doc.html
===================================================================
RCS file: /cvsroot/qemacs/qemacs/qe-doc.html,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- qe-doc.html 20 Dec 2007 16:27:22 -0000      1.4
+++ qe-doc.html 20 Dec 2007 21:37:34 -0000      1.5
@@ -99,8 +99,8 @@
 
 </li><li> 
   Small! Full version (including HTML/XML/CSS2/DocBook rendering and all
-  charsets): 200KB big. Basic version (without bidir/unicode
-  scripts/input/X11/C/Shell/HTML/dired): 49KB.
+  charsets): 270KB big. Basic version (without bidir/unicode
+  scripts/input/X11/C/Shell/HTML/dired): 88KB.
 
 </li></ul>
 

Index: qe-doc.texi
===================================================================
RCS file: /cvsroot/qemacs/qemacs/qe-doc.texi,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- qe-doc.texi 20 Dec 2007 16:27:22 -0000      1.3
+++ qe-doc.texi 20 Dec 2007 21:37:34 -0000      1.4
@@ -51,8 +51,8 @@
 
 @item 
   Small! Full version (including HTML/XML/CSS2/DocBook rendering and all
-  charsets): 200KB big. Basic version (without bidir/unicode
-  scripts/input/X11/C/Shell/HTML/dired): 49KB.
+  charsets): 270KB big. Basic version (without bidir/unicode
+  scripts/input/X11/C/Shell/HTML/dired): 88KB.
 
 @end itemize
 

Index: qe.c
===================================================================
RCS file: /cvsroot/qemacs/qemacs/qe.c,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -b -r1.45 -r1.46
--- qe.c        20 Dec 2007 16:27:22 -0000      1.45
+++ qe.c        20 Dec 2007 21:37:34 -0000      1.46
@@ -7287,12 +7287,10 @@
 #ifdef CONFIG_X11
     module_x11_init(); /* x11.c(1704) */
 #endif
-#ifndef CONFIG_TINY
 #ifdef CONFIG_HTML
     module_html_init(); /* html.c(894) */
     module_docbook_init(); /* docbook.c(53) */
 #endif
-#endif
 #ifdef CONFIG_FFMPEG
     module_video_init(); /* video.c(979) */
     module_image_init(); /* image.c(844) */

Index: unicode_join.c
===================================================================
RCS file: /cvsroot/qemacs/qemacs/unicode_join.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- unicode_join.c      18 Dec 2007 12:12:28 -0000      1.9
+++ unicode_join.c      20 Dec 2007 21:37:35 -0000      1.10
@@ -316,6 +316,7 @@
 
 int load_ligatures(void)
 {
+    return 0;
 }
 
 int unicode_to_glyphs(unsigned int *dst, unsigned int *char_to_glyph_pos,
reply via email to
[Prev in Thread] Current Thread [Next in Thread]