From 324f853c7ef10cf23765b740f3a2f5a6164ad426 Mon Sep 17 00:00:00 2001 From: Peter Breitenlohner Date: Wed, 19 May 2010 08:31:25 +0000 Subject: Avoid compiler warnings on 64Bit systems git-svn-id: svn://tug.org/texlive/trunk@18349 c570f23f-e606-0410-a88d-b1316a301751 --- Build/source/libs/t1lib/ChangeLog | 4 ++++ Build/source/libs/t1lib/Makefile.am | 2 +- Build/source/libs/t1lib/Makefile.in | 29 +++++++---------------------- 3 files changed, 12 insertions(+), 23 deletions(-) (limited to 'Build/source/libs') diff --git a/Build/source/libs/t1lib/ChangeLog b/Build/source/libs/t1lib/ChangeLog index ef262ddf80e..fcedc725b41 100644 --- a/Build/source/libs/t1lib/ChangeLog +++ b/Build/source/libs/t1lib/ChangeLog @@ -1,3 +1,7 @@ +2010-05-19 Peter Breitenlohner + + * Makefile.am: Do not compile lib/type1/bstring.c. + 2010-02-27 Peter Breitenlohner * Makefile.am: List all t1lib source files. diff --git a/Build/source/libs/t1lib/Makefile.am b/Build/source/libs/t1lib/Makefile.am index a452a5c363f..e1c720bcdb0 100644 --- a/Build/source/libs/t1lib/Makefile.am +++ b/Build/source/libs/t1lib/Makefile.am @@ -93,7 +93,6 @@ lib_type1_sources = \ $(T1LIB_TREE)/lib/type1/arith.c \ $(T1LIB_TREE)/lib/type1/arith.h \ $(T1LIB_TREE)/lib/type1/blues.h \ - $(T1LIB_TREE)/lib/type1/bstring.c \ $(T1LIB_TREE)/lib/type1/cluts.h \ $(T1LIB_TREE)/lib/type1/curves.c \ $(T1LIB_TREE)/lib/type1/curves.h \ @@ -142,6 +141,7 @@ lib_type1_sources = \ $(T1LIB_TREE)/lib/type1/util.h lib_type1_unused = \ + $(T1LIB_TREE)/lib/type1/bstring.c \ $(T1LIB_TREE)/lib/type1/t1intf.h if build diff --git a/Build/source/libs/t1lib/Makefile.in b/Build/source/libs/t1lib/Makefile.in index b68f045520e..1413c9a1e1b 100644 --- a/Build/source/libs/t1lib/Makefile.in +++ b/Build/source/libs/t1lib/Makefile.in @@ -65,12 +65,12 @@ am__objects_1 = parseAFM.$(OBJEXT) t1aaset.$(OBJEXT) \ t1enc.$(OBJEXT) t1env.$(OBJEXT) t1finfo.$(OBJEXT) \ t1load.$(OBJEXT) t1outline.$(OBJEXT) t1set.$(OBJEXT) \ t1subset.$(OBJEXT) t1trans.$(OBJEXT) -am__objects_2 = arith.$(OBJEXT) bstring.$(OBJEXT) curves.$(OBJEXT) \ - fontfcn.$(OBJEXT) hints.$(OBJEXT) lines.$(OBJEXT) \ - objects.$(OBJEXT) paths.$(OBJEXT) regions.$(OBJEXT) \ - scanfont.$(OBJEXT) spaces.$(OBJEXT) t1io.$(OBJEXT) \ - t1snap.$(OBJEXT) t1stub.$(OBJEXT) token.$(OBJEXT) \ - type1.$(OBJEXT) util.$(OBJEXT) +am__objects_2 = arith.$(OBJEXT) curves.$(OBJEXT) fontfcn.$(OBJEXT) \ + hints.$(OBJEXT) lines.$(OBJEXT) objects.$(OBJEXT) \ + paths.$(OBJEXT) regions.$(OBJEXT) scanfont.$(OBJEXT) \ + spaces.$(OBJEXT) t1io.$(OBJEXT) t1snap.$(OBJEXT) \ + t1stub.$(OBJEXT) token.$(OBJEXT) type1.$(OBJEXT) \ + util.$(OBJEXT) nodist_libt1_a_OBJECTS = $(am__objects_1) $(am__objects_2) libt1_a_OBJECTS = $(nodist_libt1_a_OBJECTS) nodist_type1afm_OBJECTS = type1afm.$(OBJEXT) @@ -258,7 +258,6 @@ lib_type1_sources = \ $(T1LIB_TREE)/lib/type1/arith.c \ $(T1LIB_TREE)/lib/type1/arith.h \ $(T1LIB_TREE)/lib/type1/blues.h \ - $(T1LIB_TREE)/lib/type1/bstring.c \ $(T1LIB_TREE)/lib/type1/cluts.h \ $(T1LIB_TREE)/lib/type1/curves.c \ $(T1LIB_TREE)/lib/type1/curves.h \ @@ -307,6 +306,7 @@ lib_type1_sources = \ $(T1LIB_TREE)/lib/type1/util.h lib_type1_unused = \ + $(T1LIB_TREE)/lib/type1/bstring.c \ $(T1LIB_TREE)/lib/type1/t1intf.h @build_TRUE@dist_check_SCRIPTS = type1afm.test @@ -391,7 +391,6 @@ distclean-compile: -rm -f *.tab.c @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/arith.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bstring.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/curves.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fontfcn.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/hints.Po@am__quote@ @@ -632,20 +631,6 @@ arith.obj: $(T1LIB_TREE)/lib/type1/arith.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 arith.obj `if test -f '$(T1LIB_TREE)/lib/type1/arith.c'; then $(CYGPATH_W) '$(T1LIB_TREE)/lib/type1/arith.c'; else $(CYGPATH_W) '$(srcdir)/$(T1LIB_TREE)/lib/type1/arith.c'; fi` -bstring.o: $(T1LIB_TREE)/lib/type1/bstring.c -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT bstring.o -MD -MP -MF $(DEPDIR)/bstring.Tpo -c -o bstring.o `test -f '$(T1LIB_TREE)/lib/type1/bstring.c' || echo '$(srcdir)/'`$(T1LIB_TREE)/lib/type1/bstring.c -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/bstring.Tpo $(DEPDIR)/bstring.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$(T1LIB_TREE)/lib/type1/bstring.c' object='bstring.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 bstring.o `test -f '$(T1LIB_TREE)/lib/type1/bstring.c' || echo '$(srcdir)/'`$(T1LIB_TREE)/lib/type1/bstring.c - -bstring.obj: $(T1LIB_TREE)/lib/type1/bstring.c -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT bstring.obj -MD -MP -MF $(DEPDIR)/bstring.Tpo -c -o bstring.obj `if test -f '$(T1LIB_TREE)/lib/type1/bstring.c'; then $(CYGPATH_W) '$(T1LIB_TREE)/lib/type1/bstring.c'; else $(CYGPATH_W) '$(srcdir)/$(T1LIB_TREE)/lib/type1/bstring.c'; fi` -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/bstring.Tpo $(DEPDIR)/bstring.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$(T1LIB_TREE)/lib/type1/bstring.c' object='bstring.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 bstring.obj `if test -f '$(T1LIB_TREE)/lib/type1/bstring.c'; then $(CYGPATH_W) '$(T1LIB_TREE)/lib/type1/bstring.c'; else $(CYGPATH_W) '$(srcdir)/$(T1LIB_TREE)/lib/type1/bstring.c'; fi` - curves.o: $(T1LIB_TREE)/lib/type1/curves.c @am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT curves.o -MD -MP -MF $(DEPDIR)/curves.Tpo -c -o curves.o `test -f '$(T1LIB_TREE)/lib/type1/curves.c' || echo '$(srcdir)/'`$(T1LIB_TREE)/lib/type1/curves.c @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/curves.Tpo $(DEPDIR)/curves.Po -- cgit v1.2.3