summaryrefslogtreecommitdiff
path: root/Build
diff options
context:
space:
mode:
Diffstat (limited to 'Build')
-rw-r--r--Build/source/texk/detex/ChangeLog4
-rw-r--r--Build/source/texk/detex/Makefile.am2
-rw-r--r--Build/source/texk/detex/Makefile.in2
-rw-r--r--Build/source/texk/ttfdump/ChangeLog13
-rw-r--r--Build/source/texk/ttfdump/Makefile.am19
-rw-r--r--Build/source/texk/ttfdump/Makefile.in34
-rw-r--r--Build/source/texk/ttfdump/libttf/font.c4
-rw-r--r--Build/source/texk/ttfdump/libttf/gcache.c7
-rw-r--r--Build/source/texk/ttfdump/libttf/stack.c3
-rw-r--r--Build/source/texk/ttfdump/libttf/tabledir.c3
-rw-r--r--Build/source/texk/ttfdump/src/ttfdump.c19
11 files changed, 71 insertions, 39 deletions
diff --git a/Build/source/texk/detex/ChangeLog b/Build/source/texk/detex/ChangeLog
index cc025cb7c9f..fbfaca1f01e 100644
--- a/Build/source/texk/detex/ChangeLog
+++ b/Build/source/texk/detex/ChangeLog
@@ -1,3 +1,7 @@
+2009-06-19 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * Makefile.am (AM_CPPFLAGS): add -Dlint to ignore rcsid.
+
2009-06-16 Peter Breitenlohner <peb@mppmu.mpg.de>
* Makefile.am: detex.l provides yywrap, no need for $(LEXLIB).
diff --git a/Build/source/texk/detex/Makefile.am b/Build/source/texk/detex/Makefile.am
index 22905568146..e64a9c97156 100644
--- a/Build/source/texk/detex/Makefile.am
+++ b/Build/source/texk/detex/Makefile.am
@@ -6,7 +6,7 @@
ACLOCAL_AMFLAGS = -I ../../m4
INCLUDES = $(KPATHSEA_INCLUDES)
-AM_CPPFLAGS = -DKPATHSEA
+AM_CPPFLAGS = -DKPATHSEA -Dlint
AM_CFLAGS = $(WARNING_CFLAGS)
## The Makefile.in from 2002 by Thomas Esser applied the sed script
diff --git a/Build/source/texk/detex/Makefile.in b/Build/source/texk/detex/Makefile.in
index a01c09a4a58..be4b26f5cf2 100644
--- a/Build/source/texk/detex/Makefile.in
+++ b/Build/source/texk/detex/Makefile.in
@@ -255,7 +255,7 @@ top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
ACLOCAL_AMFLAGS = -I ../../m4
INCLUDES = $(KPATHSEA_INCLUDES)
-AM_CPPFLAGS = -DKPATHSEA
+AM_CPPFLAGS = -DKPATHSEA -Dlint
AM_CFLAGS = $(WARNING_CFLAGS)
detex_SOURCES = detex.h detex.l
LDADD = $(KPATHSEA_LIBS)
diff --git a/Build/source/texk/ttfdump/ChangeLog b/Build/source/texk/ttfdump/ChangeLog
index 89bfc6a0b04..87424d5d08b 100644
--- a/Build/source/texk/ttfdump/ChangeLog
+++ b/Build/source/texk/ttfdump/ChangeLog
@@ -1,3 +1,16 @@
+2009-06-18 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * Makefile.am (AM_CFLAGS): enable compiler warnings.
+ * libttf/font.c (ttfCloneFont): not used.
+ * libttf/gcache.c (ttfInitCacheData): avoid ambiguous "cur = cur++".
+ (merge): only used #ifdef MERGEDELETE.
+ * libttf/stack.c (GetLONG): unused.
+ * libttf/tabledir.c (ttfCalcTableCheckSum): unused.
+ * src/ttfdump.c (dialog, add_suffix): unused.
+ (Strdup): declare as static.
+ (main): silence 'used uninitialized' warning.
+ avoid unused variables.
+
2009-06-03 Karl Berry <karl@tug.org>
* libttf/ttfread.c (ttfGetBYTE): do not make inline, just in case.
diff --git a/Build/source/texk/ttfdump/Makefile.am b/Build/source/texk/ttfdump/Makefile.am
index bbccbcb76e6..24567a36d88 100644
--- a/Build/source/texk/ttfdump/Makefile.am
+++ b/Build/source/texk/ttfdump/Makefile.am
@@ -18,9 +18,13 @@ dist-hook:
rm -f $(distdir)/src/Makefile.in
INCLUDES = -I$(top_srcdir)/include $(KPATHSEA_INCLUDES)
+AM_CPPFLAGS = -Dlint
+AM_CFLAGS = $(WARNING_CFLAGS)
noinst_LIBRARIES = libttf.a
+# libttf/interp.c is not used (would just produce compiler warnings).
+#
nodist_libttf_a_SOURCES = \
libttf/cmap.c \
libttf/cvt.c \
@@ -35,7 +39,6 @@ nodist_libttf_a_SOURCES = \
libttf/head.c \
libttf/hhea.c \
libttf/hmtx.c \
- libttf/interp.c \
libttf/kern.c \
libttf/loca.c \
libttf/ltsh.c \
@@ -54,22 +57,20 @@ nodist_libttf_a_SOURCES = \
libttf/vhea.c \
libttf/vmtx.c
-## The library doesn't actually depend on kpathsea, but this way
-## kpathsea is rebuilt before compiling ttfdump (I hope).
-libttf_a_DEPENDENCIES = $(KPATHSEA_DEPEND)
-
-## Rebuild libkpathsea
-@KPATHSEA_RULE@
-
bin_PROGRAMS = ttfdump
nodist_ttfdump_SOURCES = src/ttfdump.c
LDADD = libttf.a
+$(ttfdump_OBJECTS): $(KPATHSEA_DEPEND)
+
+## Rebuild libkpathsea
+@KPATHSEA_RULE@
+
nodist_man1_MANS = docs/ttfdump.1
-## Not yet used
+## Not used
##
EXTRA_DIST += ILX NOTE README.bg5
diff --git a/Build/source/texk/ttfdump/Makefile.in b/Build/source/texk/ttfdump/Makefile.in
index 31ea9e74c43..0d508c180fc 100644
--- a/Build/source/texk/ttfdump/Makefile.in
+++ b/Build/source/texk/ttfdump/Makefile.in
@@ -78,11 +78,11 @@ nodist_libttf_a_OBJECTS = cmap.$(OBJEXT) cvt.$(OBJEXT) \
disasm.$(OBJEXT) font.$(OBJEXT) fpgm.$(OBJEXT) gasp.$(OBJEXT) \
gcache.$(OBJEXT) glyf.$(OBJEXT) gstate.$(OBJEXT) \
hdmx.$(OBJEXT) head.$(OBJEXT) hhea.$(OBJEXT) hmtx.$(OBJEXT) \
- interp.$(OBJEXT) kern.$(OBJEXT) loca.$(OBJEXT) ltsh.$(OBJEXT) \
- maxp.$(OBJEXT) name.$(OBJEXT) os2.$(OBJEXT) pclt.$(OBJEXT) \
- post.$(OBJEXT) prep.$(OBJEXT) stack.$(OBJEXT) \
- tabledir.$(OBJEXT) ttc.$(OBJEXT) ttfread.$(OBJEXT) \
- ttfutil.$(OBJEXT) vdmx.$(OBJEXT) vhea.$(OBJEXT) vmtx.$(OBJEXT)
+ kern.$(OBJEXT) loca.$(OBJEXT) ltsh.$(OBJEXT) maxp.$(OBJEXT) \
+ name.$(OBJEXT) os2.$(OBJEXT) pclt.$(OBJEXT) post.$(OBJEXT) \
+ prep.$(OBJEXT) stack.$(OBJEXT) tabledir.$(OBJEXT) \
+ ttc.$(OBJEXT) ttfread.$(OBJEXT) ttfutil.$(OBJEXT) \
+ vdmx.$(OBJEXT) vhea.$(OBJEXT) vmtx.$(OBJEXT)
libttf_a_OBJECTS = $(nodist_libttf_a_OBJECTS)
am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)"
PROGRAMS = $(bin_PROGRAMS)
@@ -260,7 +260,12 @@ top_srcdir = @top_srcdir@
ACLOCAL_AMFLAGS = -I ../../m4
EXTRA_DIST = docs include libttf src ILX NOTE README.bg5
INCLUDES = -I$(top_srcdir)/include $(KPATHSEA_INCLUDES)
+AM_CPPFLAGS = -Dlint
+AM_CFLAGS = $(WARNING_CFLAGS)
noinst_LIBRARIES = libttf.a
+
+# libttf/interp.c is not used (would just produce compiler warnings).
+#
nodist_libttf_a_SOURCES = \
libttf/cmap.c \
libttf/cvt.c \
@@ -275,7 +280,6 @@ nodist_libttf_a_SOURCES = \
libttf/head.c \
libttf/hhea.c \
libttf/hmtx.c \
- libttf/interp.c \
libttf/kern.c \
libttf/loca.c \
libttf/ltsh.c \
@@ -294,7 +298,6 @@ nodist_libttf_a_SOURCES = \
libttf/vhea.c \
libttf/vmtx.c
-libttf_a_DEPENDENCIES = $(KPATHSEA_DEPEND)
nodist_ttfdump_SOURCES = src/ttfdump.c
LDADD = libttf.a
nodist_man1_MANS = docs/ttfdump.1
@@ -427,7 +430,6 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/head.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/hhea.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/hmtx.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/interp.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kern.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/loca.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ltsh.Po@am__quote@
@@ -650,20 +652,6 @@ hmtx.obj: libttf/hmtx.c
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o hmtx.obj `if test -f 'libttf/hmtx.c'; then $(CYGPATH_W) 'libttf/hmtx.c'; else $(CYGPATH_W) '$(srcdir)/libttf/hmtx.c'; fi`
-interp.o: libttf/interp.c
-@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT interp.o -MD -MP -MF $(DEPDIR)/interp.Tpo -c -o interp.o `test -f 'libttf/interp.c' || echo '$(srcdir)/'`libttf/interp.c
-@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/interp.Tpo $(DEPDIR)/interp.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='libttf/interp.c' object='interp.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o interp.o `test -f 'libttf/interp.c' || echo '$(srcdir)/'`libttf/interp.c
-
-interp.obj: libttf/interp.c
-@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT interp.obj -MD -MP -MF $(DEPDIR)/interp.Tpo -c -o interp.obj `if test -f 'libttf/interp.c'; then $(CYGPATH_W) 'libttf/interp.c'; else $(CYGPATH_W) '$(srcdir)/libttf/interp.c'; fi`
-@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/interp.Tpo $(DEPDIR)/interp.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='libttf/interp.c' object='interp.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o interp.obj `if test -f 'libttf/interp.c'; then $(CYGPATH_W) 'libttf/interp.c'; else $(CYGPATH_W) '$(srcdir)/libttf/interp.c'; fi`
-
kern.o: libttf/kern.c
@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT kern.o -MD -MP -MF $(DEPDIR)/kern.Tpo -c -o kern.o `test -f 'libttf/kern.c' || echo '$(srcdir)/'`libttf/kern.c
@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/kern.Tpo $(DEPDIR)/kern.Po
@@ -1308,6 +1296,8 @@ dist-hook:
rm -f $(distdir)/libttf/Makefile.in
rm -f $(distdir)/src/Makefile.in
+$(ttfdump_OBJECTS): $(KPATHSEA_DEPEND)
+
@KPATHSEA_RULE@
# Tell versions [3.59,3.63) of GNU make to not export all variables.
diff --git a/Build/source/texk/ttfdump/libttf/font.c b/Build/source/texk/ttfdump/libttf/font.c
index 474d4f008e4..c8b3784a6eb 100644
--- a/Build/source/texk/ttfdump/libttf/font.c
+++ b/Build/source/texk/ttfdump/libttf/font.c
@@ -134,6 +134,8 @@ void ttfFreeOptionalTables(TTFontPtr font)
ttfFreeVMTX(font->vmtx);
}
+#if 0
+/* Not used */
/* make a clone of the origional font
* This is use for fonts that support more than one encoding scheme
*
@@ -152,6 +154,8 @@ TTFontPtr ttfCloneFont(TTFontPtr font)
return newfont;
}
+#endif
+
static void ttfInitInterpreter(TTFontPtr font)
{
ttfInitStorageArea(font);
diff --git a/Build/source/texk/ttfdump/libttf/gcache.c b/Build/source/texk/ttfdump/libttf/gcache.c
index d926bebd680..7ecdb0a8ed7 100644
--- a/Build/source/texk/ttfdump/libttf/gcache.c
+++ b/Build/source/texk/ttfdump/libttf/gcache.c
@@ -103,7 +103,9 @@ static void ttfFreeCacheData(TTFontPtr font);
static void ttfInsertBST(TTFontPtr font,GlyphCachePtr gcache);
static GlyphCachePtr ttfSearchBST(TTFontPtr font,ULONG offset);
static void ttfDeleteBST(TTFontPtr font,ULONG offset);
+#ifdef MERGEDELETE
static void merge(GlyphCachePtr *root);
+#endif
static void copy(GlyphCachePtr *root);
void ttfInitGlyphCache(TTFontPtr font)
@@ -253,8 +255,7 @@ static void ttfInitCacheData(TTFontPtr font)
cur->glyf.flags = tmp->glyf.flags + maxPoints;
cur->glyf.xCoordinates = tmp->glyf.xCoordinates + maxPoints;
cur->glyf.yCoordinates = tmp->glyf.yCoordinates + maxPoints;
- tmp = cur;
- cur = cur++;
+ tmp = cur++;
}
}
static void ttfFreeCacheData(TTFontPtr font)
@@ -374,6 +375,7 @@ static void ttfDeleteBST(TTFontPtr font,ULONG offset)
}
+#ifdef MERGEDELETE
static void merge(GlyphCachePtr *root)
{
GlyphCachePtr tmp;
@@ -395,6 +397,7 @@ static void merge(GlyphCachePtr *root)
*root = (*root)->left;
}
}
+#endif
static void copy(GlyphCachePtr *root)
{
GlyphCachePtr tmp, parent;
diff --git a/Build/source/texk/ttfdump/libttf/stack.c b/Build/source/texk/ttfdump/libttf/stack.c
index e47b3b0af09..5ca56deb90a 100644
--- a/Build/source/texk/ttfdump/libttf/stack.c
+++ b/Build/source/texk/ttfdump/libttf/stack.c
@@ -80,6 +80,8 @@ inline SHORT GetSHORT(VirtualMachine *vm)
return 0;
}
}
+#if 0
+/* Not used */
/* read four bytes from the instruction steam */
inline LONG GetLONG(VirtualMachine *vm)
{
@@ -99,3 +101,4 @@ inline LONG GetLONG(VirtualMachine *vm)
return 0;
}
}
+#endif
diff --git a/Build/source/texk/ttfdump/libttf/tabledir.c b/Build/source/texk/ttfdump/libttf/tabledir.c
index 2e2f328beb1..c0c2980191f 100644
--- a/Build/source/texk/ttfdump/libttf/tabledir.c
+++ b/Build/source/texk/ttfdump/libttf/tabledir.c
@@ -99,6 +99,8 @@ TableDirPtr ttfLookUpTableDir(ULONG tagname,TTFontPtr font)
return NULL;
}
+#if 0
+/* Not used */
/* calculate table check sum */
/* can't be done until the data abstraction have been finished */
/* not finished yet */
@@ -119,3 +121,4 @@ ULONG ttfCalcTableCheckSum(ULONG tagname,TTFontPtr font)
return sum;
}
+#endif
diff --git a/Build/source/texk/ttfdump/src/ttfdump.c b/Build/source/texk/ttfdump/src/ttfdump.c
index d1848a08e95..468246cb984 100644
--- a/Build/source/texk/ttfdump/src/ttfdump.c
+++ b/Build/source/texk/ttfdump/src/ttfdump.c
@@ -65,9 +65,15 @@ static void print_vdmx(FILE *out);
static void print_vhea(FILE *out);
static void print_vmtx(FILE *out);
+#if 0
+/* Not used */
static void dialog (int argc, char *argv[]);
+#endif
static void usage (void);
+#if 0
+/* Not used */
static void add_suffix (char *name, char *suffix);
+#endif
#if !defined(EXIT_FAILURE)
@@ -82,7 +88,7 @@ static void add_suffix (char *name, char *suffix);
/* strdup() is not available on all platforms; this version has been
* contributed by Nelson Beebe. */
-char *
+static char *
Strdup(const char *s)
{
char *p;
@@ -101,13 +107,12 @@ Strdup(const char *s)
int
main(int argc, char *argv[])
{
- FILE *tt_file, *dp_file;
- TTCHeaderPtr ttc;
+ FILE *dp_file;
+ TTCHeaderPtr ttc = NULL; /* avoid uninitialized warning */
int c;
extern int optind;
extern char *optarg;
- char *options, *value;
char *tablename = NULL;
@@ -548,6 +553,8 @@ print_vmtx(FILE *out)
}
+#if 0
+/* Not used */
static void
dialog(int argc, char *argv[])
{
@@ -562,6 +569,7 @@ dialog(int argc, char *argv[])
else
strcpy(dumpname, *++argv);
}
+#endif
static void
@@ -572,6 +580,8 @@ usage(void)
}
+#if 0
+/* Not used */
static void
add_suffix(char *name, char *suffix)
{
@@ -595,6 +605,7 @@ add_suffix(char *name, char *suffix)
}
}
}
+#endif
/* end of ttfdump.c */
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-10 05:29:28 +0000