Attachment #1666 for bug #9078

View | Details | Raw Unified | Return to bug 9078
Collapse All | Expand All

Lines 19-24 Link Here

(-)graphviz-2.2.1/tools/expr/Makefile.am.orig (+7 lines)
19	exeval.c exexpr.c exlexname.c exopen.c exrewind.c extoken.c \	19	exeval.c exexpr.c exlexname.c exopen.c exrewind.c extoken.c \
20	extype.c exzero.c exparse.y	20	extype.c exzero.c exparse.y
21		21
		22	libexpr_la_LIBADD = \
		23	$(top_builddir)/cdt/libcdt.la \
		24	$(top_builddir)/dotneato/common/libcommon.la \
		25	$(top_builddir)/tools/ast/libast.la \
		26	$(top_builddir)/tools/sfio/libsfio.la \
		27	$(top_builddir)/tools/vmalloc/libvmalloc.la
		28
22	libexprconvenience_la_SOURCES = $(libexpr_la_SOURCES)	29	libexprconvenience_la_SOURCES = $(libexpr_la_SOURCES)
23		30
24	$(libexprconvenience_la_OBJECTS): exparse.h exparse.c exgram.h exop.h	31	$(libexprconvenience_la_OBJECTS): exparse.h exparse.c exgram.h exop.h

Lines 23-29 Link Here

(-)graphviz-2.2.1/tkspline/Makefile.am.orig (-1 / +1 lines)
23	endif	23	endif
24		24
25	libtkspline_la_SOURCES = tkspline.c	25	libtkspline_la_SOURCES = tkspline.c
26	libtkspline_la_LIBADD = \	26	libtkspline_la_LIBADD = -ltcl \
27	$(top_builddir)/tkstubs/libtkstubs.la \	27	$(top_builddir)/tkstubs/libtkstubs.la \
28	$(top_builddir)/tclstubs/libtclstubs.la	28	$(top_builddir)/tclstubs/libtclstubs.la
29		29

Lines 16-22 Link Here

(-)graphviz-2.2.1/tclpathplan/Makefile.am.orig (-1 / +1 lines)
16		16
17	libtclplan_la_SOURCES = find_ints.c intersect.c makecw.c tclpathplan.c wrapper.c	17	libtclplan_la_SOURCES = find_ints.c intersect.c makecw.c tclpathplan.c wrapper.c
18		18
19	libtclplan_la_LIBADD = \	19	libtclplan_la_LIBADD = -ltcl \
20	$(top_builddir)/tclhandle/libtclhandle.la \	20	$(top_builddir)/tclhandle/libtclhandle.la \
21	$(top_builddir)/pathplan/libpathplan.la \	21	$(top_builddir)/pathplan/libpathplan.la \
22	$(top_builddir)/tclstubs/libtclstubs.la	22	$(top_builddir)/tclstubs/libtclstubs.la

Lines 37-43 Link Here

(-)graphviz-2.2.1/tcldot/Makefile.am.orig (-1 / +1 lines)
37		37
38	libtcldot_la_SOURCES = tcldot.c tkgen.c $(top_srcdir)/gdtclft/gdtclft.c	38	libtcldot_la_SOURCES = tcldot.c tkgen.c $(top_srcdir)/gdtclft/gdtclft.c
39		39
40	libtcldot_la_LIBADD = \	40	libtcldot_la_LIBADD = -ltcl \
41	$(top_builddir)/tclhandle/libtclhandle.la \	41	$(top_builddir)/tclhandle/libtclhandle.la \
42	$(top_builddir)/tclstubs/libtclstubs.la \	42	$(top_builddir)/tclstubs/libtclstubs.la \
43	$(top_builddir)/dotneato/gvrender/libgvrender.la \	43	$(top_builddir)/dotneato/gvrender/libgvrender.la \

Lines 23-29 Link Here

(-)graphviz-2.2.1/gdtclft/Makefile.am.orig (-1 / +1 lines)
23	endif	23	endif
24		24
25	libgdtclft_la_SOURCES = gdtclft.c	25	libgdtclft_la_SOURCES = gdtclft.c
26	libgdtclft_la_LIBADD = \	26	libgdtclft_la_LIBADD = -ltcl \
27	$(top_builddir)/tclhandle/libtclhandle.la \	27	$(top_builddir)/tclhandle/libtclhandle.la \
28	$(top_builddir)/tclstubs/libtclstubs.la @GD_LIBS@	28	$(top_builddir)/tclstubs/libtclstubs.la @GD_LIBS@
29		29

Lines 18-23 Link Here

(-)graphviz-2.2.1/dotneato/twopigen/Makefile.am.orig (-1 / +3 lines)
18		18
19	libtwopigen_la_SOURCES = twopiinit.c circle.c	19	libtwopigen_la_SOURCES = twopiinit.c circle.c
20		20
21	libtwopigen_la_LIBADD = $(top_builddir)/dotneato/neatogen/libneatogen.la	21	libtwopigen_la_LIBADD = \
		22	$(top_builddir)/dotneato/neatogen/libneatogen.la \
		23	$(top_builddir)/dotneato/common/libcommon.la
22		24
23	EXTRA_DIST = Makefile.old	25	EXTRA_DIST = Makefile.old

Lines 18-23 Link Here

(-)graphviz-2.2.1/dotneato/pack/Makefile.am.orig (+1 lines)
18	pdf_DATA = pack.pdf	18	pdf_DATA = pack.pdf
19		19
20	libpack_la_SOURCES = ccomps.c pack.c	20	libpack_la_SOURCES = ccomps.c pack.c
		21	libpack_la_LIBADD = $(top_builddir)/dotneato/common/libcommon.la
21		22
22	.3.pdf:	23	.3.pdf:
23	groff -Tps -man $< \| ps2pdf - - >$@	24	groff -Tps -man $< \| ps2pdf - - >$@

Lines 25-30 Link Here

(-)graphviz-2.2.1/dotneato/neatogen/Makefile.am.orig (+1 lines)
25	conjgrad.c pca.c closest.c bfs.c constraint.c	25	conjgrad.c pca.c closest.c bfs.c constraint.c
26		26
27	libneatogen_la_LIBADD = \	27	libneatogen_la_LIBADD = \
		28	$(top_builddir)/dotneato/common/libcommon.la \
28	$(top_builddir)/dotneato/pack/libpack.la \	29	$(top_builddir)/dotneato/pack/libpack.la \
29	$(top_builddir)/pathplan/libpathplan.la \	30	$(top_builddir)/pathplan/libpathplan.la \
30	$(top_builddir)/graph/libgraph.la	31	$(top_builddir)/graph/libgraph.la

Lines 20-25 Link Here

(-)graphviz-2.2.1/dotneato/dotgen/Makefile.am.orig (-1 / +2 lines)
20		20
21	libdotgen_la_LIBADD = \	21	libdotgen_la_LIBADD = \
22	$(top_builddir)/pathplan/libpathplan.la \	22	$(top_builddir)/pathplan/libpathplan.la \
23	$(top_builddir)/graph/libgraph.la	23	$(top_builddir)/graph/libgraph.la \
		24	$(top_builddir)/dotneato/common/libcommon.la
24		25
25	EXTRA_DIST = Makefile.old	26	EXTRA_DIST = Makefile.old

Lines 25-31 Link Here

(-)graphviz-2.2.1/dotneato/common/Makefile.am.orig (-1 / +6 lines)
25	shapes.c utils.c output.c emit.c	25	shapes.c utils.c output.c emit.c
26		26
27	libcommon_la_LIBADD = \	27	libcommon_la_LIBADD = \
28	@GD_LIBS@ @EXPAT_LIBS@ @LIBSVG_CAIRO_LIBS@ @Z_LIBS@	28	@GD_LIBS@ @EXPAT_LIBS@ @LIBSVG_CAIRO_LIBS@ @Z_LIBS@ \
		29	$(top_builddir)/graph/libgraph.la \
		30	$(top_builddir)/pathplan/libpathplan.la \
		31	$(top_builddir)/cdt/libcdt.la \
		32	$(top_builddir)/dotneato/gvrender/libgvrender.la
		33
29		34
30	psgen.o psgen.lo : ps.h	35	psgen.o psgen.lo : ps.h
31		36

Lines 23-28 Link Here

(-)graphviz-2.2.1/dotneato/circogen/Makefile.am.orig (-1 / +1 lines)
23	stack.c circular.c deglist.c blocktree.c blockpath.c \	23	stack.c circular.c deglist.c blocktree.c blockpath.c \
24	circpos.c nodeset.c	24	circpos.c nodeset.c
25		25
26	libcircogen_la_LIBADD = $(top_builddir)/dotneato/neatogen/libneatogen.la	26	libcircogen_la_LIBADD = $(top_builddir)/dotneato/neatogen/libneatogen.la $(top_builddir)/dotneato/common/libcommon.la
27		27
28	EXTRA_DIST = Makefile.old	28	EXTRA_DIST = Makefile.old

Lines 21-26 Link Here

(-)graphviz-2.2.1/agraph/Makefile.am.orig (+2 lines)
21	mem.c node.c obj.c pend.c rec.c refstr.c scan.l subg.c \	21	mem.c node.c obj.c pend.c rec.c refstr.c scan.l subg.c \
22	utils.c write.c	22	utils.c write.c
23		23
		24	libagraph_la_LIBADD = $(top_builddir)/cdt/libcdt.la
		25
24	scan.o scan.lo: scan.c grammar.h	26	scan.o scan.lo: scan.c grammar.h
25		27
26	scan.c: $(top_srcdir)/agraph/scan.l	28	scan.c: $(top_srcdir)/agraph/scan.l

Return to bug 9078