From da61c991b5b5a4a063ee8302031cfad541f1cd0a Mon Sep 17 00:00:00 2001 From: ellson Date: Sun, 9 Jan 2005 02:52:09 +0000 Subject: [PATCH] fixes for --disable-shared --enable-static make cairo plugin conditional on HAVE_CAIRO remove some generated files from CVS --- cmd/dotty/dotty.pdf | Bin 6035 -> 0 bytes cmd/lefty/lefty.pdf | Bin 8200 -> 0 bytes cmd/lneato/lneato.pdf | 154 ------------------- cmd/tools/Makefile.am | 25 +++- lib/agraph/Makefile.am | 2 + lib/gd/config/Makefile.in | 307 -------------------------------------- lib/gd/test/Makefile.in | 283 ----------------------------------- lib/gvc/gvemit.c | 8 +- lib/ingraphs/Makefile.am | 2 - 9 files changed, 24 insertions(+), 757 deletions(-) delete mode 100644 cmd/dotty/dotty.pdf delete mode 100644 cmd/lefty/lefty.pdf delete mode 100644 cmd/lneato/lneato.pdf delete mode 100644 lib/gd/config/Makefile.in delete mode 100644 lib/gd/test/Makefile.in diff --git a/cmd/dotty/dotty.pdf b/cmd/dotty/dotty.pdf deleted file mode 100644 index e3e7c10c48304c6c5ba273215128b20203c8028a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6035 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 QWJwV8TFTEad{PAU8%R@J&j0`b diff --git a/cmd/lefty/lefty.pdf b/cmd/lefty/lefty.pdf deleted file mode 100644 index 43d218a45c1876c6c0af9929d66fc36150df096b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 8200 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 Y`9$Q!v1fCT$N{VcKm5yS8|$F{2lm8~YybcN diff --git a/cmd/lneato/lneato.pdf b/cmd/lneato/lneato.pdf deleted file mode 100644 index 41efcb860..000000000 --- a/cmd/lneato/lneato.pdf +++ /dev/null @@ -1,154 +0,0 @@ -%PDF-1.2 -%Ç쏢 -6 0 obj -<> -stream -xœ•VێÛ6}÷WÌ£Č(êÆÇíÖMw·k·iÑ䁑h[…nÑeí7äWúÞd­ÖY´0 $gxfæÌ~ŸPðÕÇþfÕêëêÝC‡~õ¨Þr?Y?ìp“«…Ý~e,($$œ‘”îZyn7Wov­‚ˆDîïòÕ½§°ËVÞîNmQF¨ÝòÕ2‹C’àÓÊûäÑOoÀùý„ü¿91¦jçÝ¥‘ðH¡\‡QLXk[7åÚàVßA'Ò¹§Ÿ7ƍ 4ðIèc”kØCˆ´¬¥ø®àz쇦*þ_J ï;Ña“CÓ]@ƒ(Ö4&©rämÿ¸½»ßÞlgçÔ!}F_eoYÀIIL ^ïυiDҀs·þí¹%æÌ·9 H¤cýì<°ó™(™gã[)^Bbkâ}¾!¥”ðy”?n¶×7÷»›»Ûÿ('4¶WùÈ&®_ô à ³,u–aßá(áwø¨+J9ñ9³‹:×niB"»¦²`(pÚZ -¤ŒÏ iàeOý +7ƒ¦#%~’.ñTâ ¾HèÆ„‚Ö¢ÎEÙÔÒâ3lMˆ,œî7T~k )g®f°Kœ¹¥^ìmIÏ`3…¡kêd«ckÆ1~ìgtU9m[™Š¦î1ab€±—&•=1(bkïÝ ‰2ôÜ5%Tc9-òû4% :ˆ§ éú~Z-êä…FÏa¼·—DÀ³›g¤X3?%}„¯1#òCW‰”‡Ž§®YCSÃдÐìÎST GÞK~c’Ö¯'L>gÖXÔÑ+å~xZtFJRû2¬”0Ž•ù¾q ™ÅÍØ.kىrݎ]Û`ÉÚ®ÁÜU•œyÈìXc…K̓ÀWhYK•¶È†±“ýDê‰Ð¾9pT,®¡¨Ùµ -u -:ŠÏBú1cñˆˆ4#ð¾ä?ý„[~j¼Š¥¨£8H苪(‚nÀ1K‰;Š|ü Aäp­Ó¡h§N ¼¶:·3u…#TŠ‰‹"“ÚVÓËtDc;Ñ©#˜Æ¥r§@5-æ×ôÅKÊ énß!#sr#:9‘PôKuæ„E¯S€ù“H…ä~¬3À½M¤Ô¢Â#d+sås1­sù­–6üydF¨ 5Ðԏ“sB|ˎ²9Ú"N²,‰-}š:қéVŠ§f&l…ðåiÙ)(`N«.6ª›&‘SÓæêƒô9p"ijÙQ mo•V¶ƒÓýÉÞjZÖTÕ¨º`E1—úà€ -¢àS,7õ¢DYœ‡Þ¯[ó -«¦qü~ñ®ÀAšøgŠ×8l¡•ìû¦Uu%vêC”=jæ[=èLi•4‹B•º¨MèÊ ó¢o±DnC.§nˆ³èUBÏ“Üöüž‹Íëát)!ÃÁsažwúðÊSgùX™¦Å}‡ÞëÀµbEç¹#»st E±çÙn6põa{÷â@gB¿"߂æ„ýŸ7ƒû¿x+¡†œ'gú苞N‹V«Öa,rIÌó_Í 0aƚªÅÍ~Y©Ï¿Ìöµendstream -endobj -7 0 obj -1221 -endobj -5 0 obj -<> -/Contents 6 0 R ->> -endobj -3 0 obj -<< /Type /Pages /Kids [ -5 0 R -] /Count 1 ->> -endobj -1 0 obj -<> -endobj -4 0 obj -<> -endobj -14 0 obj -<> -endobj -15 0 obj -<> -endobj -9 0 obj -<> -endobj -16 0 obj -<> -endobj -12 0 obj -<> -endobj -13 0 obj -<> -endobj -17 0 obj -<> -endobj -10 0 obj -<> -endobj -11 0 obj -<> -endobj -8 0 obj -<> -endobj -2 0 obj -<>endobj -xref -0 18 -0000000000 65535 f -0000001545 00000 n -0000005563 00000 n -0000001486 00000 n -0000001593 00000 n -0000001326 00000 n -0000000015 00000 n -0000001306 00000 n -0000005502 00000 n -0000001730 00000 n -0000004273 00000 n -0000004334 00000 n -0000002974 00000 n -0000003037 00000 n -0000001648 00000 n -0000001678 00000 n -0000002908 00000 n -0000004217 00000 n -trailer -<< /Size 18 /Root 1 0 R /Info 2 0 R ->> -startxref -5613 -%%EOF diff --git a/cmd/tools/Makefile.am b/cmd/tools/Makefile.am index a1a0c85e0..3972daf78 100644 --- a/cmd/tools/Makefile.am +++ b/cmd/tools/Makefile.am @@ -38,7 +38,8 @@ gxl2dot_SOURCES = cvtgxl.c dot2gxl.c gxl2dot.c gxl2dot_LDADD = \ $(top_builddir)/lib/ingraphs/libingraphs.la \ - $(top_builddir)/lib/agraph/libagraph.la @EXPAT_LIBS@ + $(top_builddir)/lib/agraph/libagraph.la @EXPAT_LIBS@ \ + $(top_builddir)/lib/graph/libgraph.la sccmap_SOURCES = sccmap.c @@ -49,12 +50,14 @@ sccmap_LDADD = \ ccomps_SOURCES = ccomps.c ccomps_LDADD = \ - $(top_builddir)/lib/ingraphs/libingraphs.la + $(top_builddir)/lib/ingraphs/libingraphs.la \ + $(top_builddir)/lib/graph/libgraph.la tred_SOURCES = tred.c tred_LDADD = \ - $(top_builddir)/lib/ingraphs/libingraphs.la + $(top_builddir)/lib/ingraphs/libingraphs.la \ + $(top_builddir)/lib/graph/libgraph.la unflatten_SOURCES = unflatten.c @@ -65,28 +68,32 @@ unflatten_LDADD = \ acyclic_SOURCES = acyclic.c acyclic_LDADD = \ - $(top_builddir)/lib/ingraphs/libingraphs.la + $(top_builddir)/lib/ingraphs/libingraphs.la \ + $(top_builddir)/lib/graph/libgraph.la nop_SOURCES = nop.c nop_LDADD = \ $(top_builddir)/lib/ingraphs/libingraphs.la \ - $(top_builddir)/lib/agraph/libagraph.la + $(top_builddir)/lib/graph/libgraph.la gvcolor_SOURCES = gvcolor.c colxlate.c colortbl.h gvcolor_LDADD = \ - $(top_builddir)/lib/ingraphs/libingraphs.la + $(top_builddir)/lib/ingraphs/libingraphs.la \ + $(top_builddir)/lib/graph/libgraph.la bcomps_SOURCES = bcomps.c bcomps_LDADD = \ - $(top_builddir)/lib/ingraphs/libingraphs.la + $(top_builddir)/lib/ingraphs/libingraphs.la \ + $(top_builddir)/lib/graph/libgraph.la gc_SOURCES = gc.c gc_LDADD = \ - $(top_builddir)/lib/ingraphs/libingraphs.la + $(top_builddir)/lib/ingraphs/libingraphs.la \ + $(top_builddir)/lib/graph/libgraph.la gvpack_SOURCES = gvpack.c plugins.c @@ -95,12 +102,14 @@ gvpack_LDADD = \ $(top_builddir)/lib/common/libcommon.la \ $(top_builddir)/lib/gvc/libgvc.la \ $(top_builddir)/lib/ingraphs/libingraphs.la \ + $(top_builddir)/lib/graph/libgraph.la \ $(top_builddir)/plugin/layout/libgvplugin_layout.la else gvpack_LDADD = \ $(top_builddir)/lib/common/libcommon.la \ $(top_builddir)/lib/gvc/libgvc.la \ $(top_builddir)/lib/ingraphs/libingraphs.la \ + $(top_builddir)/lib/graph/libgraph.la \ $(top_builddir)/plugin/cairo/libgvplugin_cairo.la \ $(top_builddir)/plugin/gd/libgvplugin_gd.la \ $(top_builddir)/plugin/text/libgvplugin_text.la \ diff --git a/lib/agraph/Makefile.am b/lib/agraph/Makefile.am index 847d568b0..0cfea4c7f 100644 --- a/lib/agraph/Makefile.am +++ b/lib/agraph/Makefile.am @@ -21,6 +21,8 @@ libagraph_la_SOURCES = agerror.c apply.c attr.c \ mem.c node.c obj.c pend.c rec.c refstr.c scan.l subg.c \ utils.c write.c +libagraph_la_LIBADD = $(top_builddir)/lib/cdt/libcdt.la + scan.o scan.lo: scan.c grammar.h scan.c: $(top_srcdir)/lib/agraph/scan.l diff --git a/lib/gd/config/Makefile.in b/lib/gd/config/Makefile.in deleted file mode 100644 index ea74bbbbc..000000000 --- a/lib/gd/config/Makefile.in +++ /dev/null @@ -1,307 +0,0 @@ -# Makefile.in generated by automake 1.7.2 from Makefile.am. -# @configure_input@ - -# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 -# Free Software Foundation, Inc. -# This Makefile.in is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY, to the extent permitted by law; without -# even the implied warranty of MERCHANTABILITY or FITNESS FOR A -# PARTICULAR PURPOSE. - -@SET_MAKE@ - -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ -VPATH = @srcdir@ -pkgdatadir = $(datadir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ -pkgincludedir = $(includedir)/@PACKAGE@ -top_builddir = .. - -am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -INSTALL = @INSTALL@ -install_sh_DATA = $(install_sh) -c -m 644 -install_sh_PROGRAM = $(install_sh) -c -install_sh_SCRIPT = $(install_sh) -c -INSTALL_HEADER = $(INSTALL_DATA) -transform = $(program_transform_name) -NORMAL_INSTALL = : -PRE_INSTALL = : -POST_INSTALL = : -NORMAL_UNINSTALL = : -PRE_UNINSTALL = : -POST_UNINSTALL = : -host_triplet = @host@ -ACLOCAL = @ACLOCAL@ -AMDEP_FALSE = @AMDEP_FALSE@ -AMDEP_TRUE = @AMDEP_TRUE@ -AMTAR = @AMTAR@ -AUTOCONF = @AUTOCONF@ -AUTOHEADER = @AUTOHEADER@ -AUTOMAKE = @AUTOMAKE@ -AWK = @AWK@ -CC = @CC@ -CCDEPMODE = @CCDEPMODE@ -CFLAGS = @CFLAGS@ -CPP = @CPP@ -CPPFLAGS = @CPPFLAGS@ -CYGPATH_W = @CYGPATH_W@ -DEFS = @DEFS@ -DEPDIR = @DEPDIR@ -ECHO = @ECHO@ -ECHO_C = @ECHO_C@ -ECHO_N = @ECHO_N@ -ECHO_T = @ECHO_T@ -EGREP = @EGREP@ -EXEEXT = @EXEEXT@ -FREETYPE_CONFIG = @FREETYPE_CONFIG@ -GDLIBNAME = @GDLIBNAME@ -GDLIB_MAJOR = @GDLIB_MAJOR@ -GDLIB_MINOR = @GDLIB_MINOR@ -GDLIB_REVISION = @GDLIB_REVISION@ -INSTALL_DATA = @INSTALL_DATA@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ -INSTALL_SCRIPT = @INSTALL_SCRIPT@ -INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -LDFLAGS = @LDFLAGS@ -LIBICONV = @LIBICONV@ -LIBOBJS = @LIBOBJS@ -LIBPNG_CONFIG = @LIBPNG_CONFIG@ -LIBS = @LIBS@ -LIBTOOL = @LIBTOOL@ -LN_S = @LN_S@ -LTLIBICONV = @LTLIBICONV@ -LTLIBOBJS = @LTLIBOBJS@ -MAKEINFO = @MAKEINFO@ -OBJEXT = @OBJEXT@ -PACKAGE = @PACKAGE@ -PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -PACKAGE_NAME = @PACKAGE_NAME@ -PACKAGE_STRING = @PACKAGE_STRING@ -PACKAGE_TARNAME = @PACKAGE_TARNAME@ -PACKAGE_VERSION = @PACKAGE_VERSION@ -PATH_SEPARATOR = @PATH_SEPARATOR@ -RANLIB = @RANLIB@ -SET_MAKE = @SET_MAKE@ -SHELL = @SHELL@ -STRIP = @STRIP@ -VERSION = @VERSION@ -ac_ct_CC = @ac_ct_CC@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ -am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ -am__include = @am__include@ -am__quote = @am__quote@ -bindir = @bindir@ -build = @build@ -build_alias = @build_alias@ -build_cpu = @build_cpu@ -build_os = @build_os@ -build_vendor = @build_vendor@ -datadir = @datadir@ -exec_prefix = @exec_prefix@ -host = @host@ -host_alias = @host_alias@ -host_cpu = @host_cpu@ -host_os = @host_os@ -host_vendor = @host_vendor@ -includedir = @includedir@ -infodir = @infodir@ -install_sh = @install_sh@ -libdir = @libdir@ -libexecdir = @libexecdir@ -localstatedir = @localstatedir@ -mandir = @mandir@ -oldincludedir = @oldincludedir@ -prefix = @prefix@ -program_transform_name = @program_transform_name@ -sbindir = @sbindir@ -sharedstatedir = @sharedstatedir@ -sysconfdir = @sysconfdir@ -target_alias = @target_alias@ -AUTOMAKE_OPTIONS = foreign 1.7 - -EXTRA_DIST = gdlib-config.in - -bin_SCRIPTS = gdlib-config -subdir = config -mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs -CONFIG_HEADER = $(top_builddir)/config.h -CONFIG_CLEAN_FILES = gdlib-config -SCRIPTS = $(bin_SCRIPTS) - -DIST_SOURCES = -DIST_COMMON = Makefile.am Makefile.in config.guess config.rpath \ - config.sub depcomp gdlib-config.in install-sh ltmain.sh missing \ - mkinstalldirs -all: all-am - -.SUFFIXES: -$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.ac $(ACLOCAL_M4) - cd $(top_srcdir) && \ - $(AUTOMAKE) --foreign config/Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) -gdlib-config: $(top_builddir)/config.status gdlib-config.in - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ -binSCRIPT_INSTALL = $(INSTALL_SCRIPT) -install-binSCRIPTS: $(bin_SCRIPTS) - @$(NORMAL_INSTALL) - $(mkinstalldirs) $(DESTDIR)$(bindir) - @list='$(bin_SCRIPTS)'; for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - if test -f $$d$$p; then \ - f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \ - echo " $(binSCRIPT_INSTALL) $$d$$p $(DESTDIR)$(bindir)/$$f"; \ - $(binSCRIPT_INSTALL) $$d$$p $(DESTDIR)$(bindir)/$$f; \ - else :; fi; \ - done - -uninstall-binSCRIPTS: - @$(NORMAL_UNINSTALL) - @list='$(bin_SCRIPTS)'; for p in $$list; do \ - f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \ - echo " rm -f $(DESTDIR)$(bindir)/$$f"; \ - rm -f $(DESTDIR)$(bindir)/$$f; \ - done - -mostlyclean-libtool: - -rm -f *.lo - -clean-libtool: - -rm -rf .libs _libs - -distclean-libtool: - -rm -f libtool -uninstall-info-am: -tags: TAGS -TAGS: - -ctags: CTAGS -CTAGS: - -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - -top_distdir = .. -distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) - -distdir: $(DISTFILES) - @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ - list='$(DISTFILES)'; for file in $$list; do \ - case $$file in \ - $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ - $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ - esac; \ - if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test "$$dir" != "$$file" && test "$$dir" != "."; then \ - dir="/$$dir"; \ - $(mkinstalldirs) "$(distdir)$$dir"; \ - else \ - dir=''; \ - fi; \ - if test -d $$d/$$file; then \ - if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ - fi; \ - cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ - else \ - test -f $(distdir)/$$file \ - || cp -p $$d/$$file $(distdir)/$$file \ - || exit 1; \ - fi; \ - done -check-am: all-am -check: check-am -all-am: Makefile $(SCRIPTS) - -installdirs: - $(mkinstalldirs) $(DESTDIR)$(bindir) - -install: install-am -install-exec: install-exec-am -install-data: install-data-am -uninstall: uninstall-am - -install-am: all-am - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am - -installcheck: installcheck-am -install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install -mostlyclean-generic: - -clean-generic: - -distclean-generic: - -rm -f Makefile $(CONFIG_CLEAN_FILES) - -maintainer-clean-generic: - @echo "This command is intended for maintainers to use" - @echo "it deletes files that may require special tools to rebuild." -clean: clean-am - -clean-am: clean-generic clean-libtool mostlyclean-am - -distclean: distclean-am - -distclean-am: clean-am distclean-generic distclean-libtool - -dvi: dvi-am - -dvi-am: - -info: info-am - -info-am: - -install-data-am: - -install-exec-am: install-binSCRIPTS - -install-info: install-info-am - -install-man: - -installcheck-am: - -maintainer-clean: maintainer-clean-am - -maintainer-clean-am: distclean-am maintainer-clean-generic - -mostlyclean: mostlyclean-am - -mostlyclean-am: mostlyclean-generic mostlyclean-libtool - -pdf: pdf-am - -pdf-am: - -ps: ps-am - -ps-am: - -uninstall-am: uninstall-binSCRIPTS uninstall-info-am - -.PHONY: all all-am check check-am clean clean-generic clean-libtool \ - distclean distclean-generic distclean-libtool distdir dvi \ - dvi-am info info-am install install-am install-binSCRIPTS \ - install-data install-data-am install-exec install-exec-am \ - install-info install-info-am install-man install-strip \ - installcheck installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \ - uninstall-binSCRIPTS uninstall-info-am - -# Tell versions [3.59,3.63) of GNU make to not export all variables. -# Otherwise a system limit (for SysV at least) may be exceeded. -.NOEXPORT: diff --git a/lib/gd/test/Makefile.in b/lib/gd/test/Makefile.in deleted file mode 100644 index 6be93d46b..000000000 --- a/lib/gd/test/Makefile.in +++ /dev/null @@ -1,283 +0,0 @@ -# Makefile.in generated by automake 1.7.2 from Makefile.am. -# @configure_input@ - -# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 -# Free Software Foundation, Inc. -# This Makefile.in is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY, to the extent permitted by law; without -# even the implied warranty of MERCHANTABILITY or FITNESS FOR A -# PARTICULAR PURPOSE. - -@SET_MAKE@ - -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ -VPATH = @srcdir@ -pkgdatadir = $(datadir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ -pkgincludedir = $(includedir)/@PACKAGE@ -top_builddir = .. - -am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -INSTALL = @INSTALL@ -install_sh_DATA = $(install_sh) -c -m 644 -install_sh_PROGRAM = $(install_sh) -c -install_sh_SCRIPT = $(install_sh) -c -INSTALL_HEADER = $(INSTALL_DATA) -transform = $(program_transform_name) -NORMAL_INSTALL = : -PRE_INSTALL = : -POST_INSTALL = : -NORMAL_UNINSTALL = : -PRE_UNINSTALL = : -POST_UNINSTALL = : -host_triplet = @host@ -ACLOCAL = @ACLOCAL@ -AMDEP_FALSE = @AMDEP_FALSE@ -AMDEP_TRUE = @AMDEP_TRUE@ -AMTAR = @AMTAR@ -AUTOCONF = @AUTOCONF@ -AUTOHEADER = @AUTOHEADER@ -AUTOMAKE = @AUTOMAKE@ -AWK = @AWK@ -CC = @CC@ -CCDEPMODE = @CCDEPMODE@ -CFLAGS = @CFLAGS@ -CPP = @CPP@ -CPPFLAGS = @CPPFLAGS@ -CYGPATH_W = @CYGPATH_W@ -DEFS = @DEFS@ -DEPDIR = @DEPDIR@ -ECHO = @ECHO@ -ECHO_C = @ECHO_C@ -ECHO_N = @ECHO_N@ -ECHO_T = @ECHO_T@ -EGREP = @EGREP@ -EXEEXT = @EXEEXT@ -FEATURES = @FEATURES@ -FREETYPE_CONFIG = @FREETYPE_CONFIG@ -GDLIBNAME = @GDLIBNAME@ -GDLIB_MAJOR = @GDLIB_MAJOR@ -GDLIB_MINOR = @GDLIB_MINOR@ -GDLIB_REVISION = @GDLIB_REVISION@ -INSTALL_DATA = @INSTALL_DATA@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ -INSTALL_SCRIPT = @INSTALL_SCRIPT@ -INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -LDFLAGS = @LDFLAGS@ -LIBICONV = @LIBICONV@ -LIBOBJS = @LIBOBJS@ -LIBPNG12_CONFIG = @LIBPNG12_CONFIG@ -LIBPNG_CONFIG = @LIBPNG_CONFIG@ -LIBS = @LIBS@ -LIBTOOL = @LIBTOOL@ -LN_S = @LN_S@ -LTLIBICONV = @LTLIBICONV@ -LTLIBOBJS = @LTLIBOBJS@ -MAKEINFO = @MAKEINFO@ -OBJEXT = @OBJEXT@ -PACKAGE = @PACKAGE@ -PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -PACKAGE_NAME = @PACKAGE_NAME@ -PACKAGE_STRING = @PACKAGE_STRING@ -PACKAGE_TARNAME = @PACKAGE_TARNAME@ -PACKAGE_VERSION = @PACKAGE_VERSION@ -PATH_SEPARATOR = @PATH_SEPARATOR@ -PTHREAD_CC = @PTHREAD_CC@ -PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ -PTHREAD_LIBS = @PTHREAD_LIBS@ -RANLIB = @RANLIB@ -SET_MAKE = @SET_MAKE@ -SHELL = @SHELL@ -STRIP = @STRIP@ -VERSION = @VERSION@ -ac_ct_CC = @ac_ct_CC@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ -am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ -am__include = @am__include@ -am__quote = @am__quote@ -bindir = @bindir@ -build = @build@ -build_alias = @build_alias@ -build_cpu = @build_cpu@ -build_os = @build_os@ -build_vendor = @build_vendor@ -datadir = @datadir@ -exec_prefix = @exec_prefix@ -host = @host@ -host_alias = @host_alias@ -host_cpu = @host_cpu@ -host_os = @host_os@ -host_vendor = @host_vendor@ -includedir = @includedir@ -infodir = @infodir@ -install_sh = @install_sh@ -libdir = @libdir@ -libexecdir = @libexecdir@ -localstatedir = @localstatedir@ -mandir = @mandir@ -oldincludedir = @oldincludedir@ -prefix = @prefix@ -program_transform_name = @program_transform_name@ -sbindir = @sbindir@ -sharedstatedir = @sharedstatedir@ -sysconfdir = @sysconfdir@ -target_alias = @target_alias@ -AUTOMAKE_OPTIONS = foreign 1.7 - -EXTRA_DIST = gdtest.gd2 gdtest.png gdtest_200_300_150_100.png gdtest_merge.png gdtest_wbmp_to_png.png -subdir = test -mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs -CONFIG_HEADER = $(top_builddir)/config.h -CONFIG_CLEAN_FILES = -DIST_SOURCES = -DIST_COMMON = Makefile.am Makefile.in -all: all-am - -.SUFFIXES: -$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.ac $(ACLOCAL_M4) - cd $(top_srcdir) && \ - $(AUTOMAKE) --foreign test/Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) - -mostlyclean-libtool: - -rm -f *.lo - -clean-libtool: - -rm -rf .libs _libs - -distclean-libtool: - -rm -f libtool -uninstall-info-am: -tags: TAGS -TAGS: - -ctags: CTAGS -CTAGS: - -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - -top_distdir = .. -distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) - -distdir: $(DISTFILES) - @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ - list='$(DISTFILES)'; for file in $$list; do \ - case $$file in \ - $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ - $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ - esac; \ - if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test "$$dir" != "$$file" && test "$$dir" != "."; then \ - dir="/$$dir"; \ - $(mkinstalldirs) "$(distdir)$$dir"; \ - else \ - dir=''; \ - fi; \ - if test -d $$d/$$file; then \ - if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ - fi; \ - cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ - else \ - test -f $(distdir)/$$file \ - || cp -p $$d/$$file $(distdir)/$$file \ - || exit 1; \ - fi; \ - done -check-am: all-am -check: check-am -all-am: Makefile - -installdirs: - -install: install-am -install-exec: install-exec-am -install-data: install-data-am -uninstall: uninstall-am - -install-am: all-am - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am - -installcheck: installcheck-am -install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install -mostlyclean-generic: - -clean-generic: - -distclean-generic: - -rm -f Makefile $(CONFIG_CLEAN_FILES) - -maintainer-clean-generic: - @echo "This command is intended for maintainers to use" - @echo "it deletes files that may require special tools to rebuild." -clean: clean-am - -clean-am: clean-generic clean-libtool mostlyclean-am - -distclean: distclean-am - -distclean-am: clean-am distclean-generic distclean-libtool - -dvi: dvi-am - -dvi-am: - -info: info-am - -info-am: - -install-data-am: - -install-exec-am: - -install-info: install-info-am - -install-man: - -installcheck-am: - -maintainer-clean: maintainer-clean-am - -maintainer-clean-am: distclean-am maintainer-clean-generic - -mostlyclean: mostlyclean-am - -mostlyclean-am: mostlyclean-generic mostlyclean-libtool - -pdf: pdf-am - -pdf-am: - -ps: ps-am - -ps-am: - -uninstall-am: uninstall-info-am - -.PHONY: all all-am check check-am clean clean-generic clean-libtool \ - distclean distclean-generic distclean-libtool distdir dvi \ - dvi-am info info-am install install-am install-data \ - install-data-am install-exec install-exec-am install-info \ - install-info-am install-man install-strip installcheck \ - installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \ - uninstall-info-am - -# Tell versions [3.59,3.63) of GNU make to not export all variables. -# Otherwise a system limit (for SysV at least) may be exceeded. -.NOEXPORT: diff --git a/lib/gvc/gvemit.c b/lib/gvc/gvemit.c index a49d3080e..4804596c6 100644 --- a/lib/gvc/gvemit.c +++ b/lib/gvc/gvemit.c @@ -20,7 +20,7 @@ #include -#if !defined(X_DISPLAY_MISSING) && !defined(DISABLE_GVRENDER) +#if !defined(X_DISPLAY_MISSING) && !defined(DISABLE_GVRENDER) && defined(HAVE_CAIRO) #include #endif @@ -32,7 +32,8 @@ extern void emit_graph(GVC_t * gvc, graph_t * g, int flags); -#if !defined(X_DISPLAY_MISSING) && !defined(DISABLE_GVRENDER) +#if !defined(X_DISPLAY_MISSING) && !defined(DISABLE_GVRENDER) && defined(HAVE_CAIRO) + #define PANFACTOR 10 #define ZOOMFACTOR 1.1 @@ -537,7 +538,8 @@ static int toggle_fit_cb(win_t * win) void gvemit_graph(GVC_t * gvc, graph_t * g, int flags) { if (flags & GVRENDER_X11_EVENTS) { -#if !defined(X_DISPLAY_MISSING) && !defined(DISABLE_GVRENDER) +#if !defined(X_DISPLAY_MISSING) && !defined(DISABLE_GVRENDER) && defined(HAVE_CAIRO) + win_t win; const char *display=NULL; int argb=0; diff --git a/lib/ingraphs/Makefile.am b/lib/ingraphs/Makefile.am index a385ea79f..fdb47020d 100644 --- a/lib/ingraphs/Makefile.am +++ b/lib/ingraphs/Makefile.am @@ -9,5 +9,3 @@ noinst_HEADERS = ingraphs.h noinst_LTLIBRARIES = libingraphs.la libingraphs_la_SOURCES = ingraphs.c - -libingraphs_la_LIBADD = $(top_builddir)/lib/graph/libgraph.la -- 2.40.0