summaryrefslogtreecommitdiff
path: root/Build/source/texk/web2c/luatexdir
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2008-04-15 23:20:46 +0000
committerKarl Berry <karl@freefriends.org>2008-04-15 23:20:46 +0000
commit852df5a4bca0e1a04205d6174789ce30fc96ec45 (patch)
tree52185f33153b6e7a814c9c24ea3192cd3fec10a5 /Build/source/texk/web2c/luatexdir
parent0b4a47871b0fdceacb8444a72a1fc3a7b7b9ab9b (diff)
use one makecpool for all programs
git-svn-id: svn://tug.org/texlive/trunk@7433 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk/web2c/luatexdir')
-rw-r--r--Build/source/texk/web2c/luatexdir/Makefile.in5
-rw-r--r--Build/source/texk/web2c/luatexdir/luatex.mk4
-rw-r--r--Build/source/texk/web2c/luatexdir/makecpool.c60
3 files changed, 3 insertions, 66 deletions
diff --git a/Build/source/texk/web2c/luatexdir/Makefile.in b/Build/source/texk/web2c/luatexdir/Makefile.in
index 5f30dd24842..43f433fd8b8 100644
--- a/Build/source/texk/web2c/luatexdir/Makefile.in
+++ b/Build/source/texk/web2c/luatexdir/Makefile.in
@@ -107,7 +107,7 @@ textcodes.o \
utils.o \
writezip.o
-all: libpdf.a makecpool
+all: libpdf.a $(makecpool)
libpdf.a: lua/mp.c lua/psout.c $(OBJS)
rm -f $@
@@ -120,9 +120,6 @@ lua/mp.c: lua/mp.w
lua/psout.c: lua/psout.w
$(CTANGLE) $(srcdir)/lua/psout.w - lua/psout.c
-makecpool: makecpool.o
- $(link_command) makecpool.o
-
kpse_include ../make/clean.mk
clean::
diff --git a/Build/source/texk/web2c/luatexdir/luatex.mk b/Build/source/texk/web2c/luatexdir/luatex.mk
index 4bb69034369..02fc2bae055 100644
--- a/Build/source/texk/web2c/luatexdir/luatex.mk
+++ b/Build/source/texk/web2c/luatexdir/luatex.mk
@@ -53,8 +53,8 @@ $(luatexdir)/luatexextra.h: $(luatexdir)/luatexextra.in $(luatexdir)/luatex.vers
test -d $(luatexdir) || mkdir $(luatexdir)
sed -e s/LUATEX-VERSION/`cat $(luatexdir)/luatex.version`/ \
$(srcdir)/$(luatexdir)/luatexextra.in >$@
-loadpool.c: luatex.pool $(luatexdir)/makecpool
- $(native)/$(luatexdir)/makecpool luatex.pool luatexdir/ptexlib.h > loadpool.c
+loadpool.c: luatex.pool $(makecpool)
+ $(makecpool) luatex.pool luatexdir/ptexlib.h >$@ || rm -f $@
# luatangle we need a private version of tangle
diff --git a/Build/source/texk/web2c/luatexdir/makecpool.c b/Build/source/texk/web2c/luatexdir/makecpool.c
deleted file mode 100644
index 162a4848482..00000000000
--- a/Build/source/texk/web2c/luatexdir/makecpool.c
+++ /dev/null
@@ -1,60 +0,0 @@
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-
-int main(int argc, char *argv[]) {
- if (argc!=3) {
- puts("Need exactly two arguments: pool_name and header_name");
- exit(1);
- }
- char *filename = argv[1];
- char *headername = argv[2];
- FILE *fh = fopen(filename,"r");
- char data[1024];
- printf(
- "/* This file is auto-generated by makecpool */\n"
- "\n"
- "#include <stdio.h>\n"
- "#include \"%s\"\n"
- "\n"
- "static char *poolfilearr[] = {\n",headername);
- while (fgets(data,1024,fh)) {
- int len = strlen(data);
- int o = 0; /* skip first o characters*/
- int i;
- if (data[len-1]=='\n') { /* chomp;*/
- data[len-1] = 0;
- len--;
- }
- if (data[0]=='*') break; /* last if !^\*!; */
- if (data[0]>='0' && data[0]<='9' && data[1]>='0' && data[1]<='9') {
- o=2; /* $data =~ s/^\d\d//; */
- }
- printf(" \"");
- for (i=o; i<len; i++) {
- if (data[i]=='"' || data[i]=='\\') putchar('\\');
- if (data[i]=='?') printf("\" \""); /* suppress trigraphs */
- putchar(data[i]);
- } /* $data =~ s/(["\\])/\\$1/g; */
- printf("\",\n");
- }
- fclose(fh);
- printf(" NULL };\n"
- "int loadpoolstrings (integer spare_size) {\n"
- " strnumber g=0;\n"
- " int i=0,j=0;\n"
- " char *s;\n"
- " while ((s = poolfilearr[j++])) {\n"
- " int l = strlen (s);\n"
- " i += l;\n"
- " if (i>=spare_size) return 0;\n"
- /*" while (l-- > 0) strpool[poolptr++] = *s++;\n"*/
- " while (l-- > 0) str_pool[pool_ptr++] = *s++;\n"
- /* " g = makestring();\n"*/
- " g = make_string();\n"
- /* " strref[g]= 127;\n"*/
- " }\n"
- " return g;\n"
- "}\n");
- return 0;
-}