Ubuntu
ivtools package

Merge lp:~l3on/ubuntu/precise/ivtools/fix-ftbfs into lp:ubuntu/precise/ivtools

  1. Precise (12.04)
  2. fix-ftbfs
  3. Merge into precise
Proposed by Leo Iannacone
Status: Merged
Merged at revision: 16
Proposed branch: lp:~l3on/ubuntu/precise/ivtools/fix-ftbfs
Merge into: lp:ubuntu/precise/ivtools
Diff against target: 910 lines (+851/-2)
7 files modified
.pc/0101-fix_pkglibdr_data.patch/Makefile.am (+817/-0)
.pc/applied-patches (+1/-0)
Makefile.am (+2/-1)
debian/changelog (+7/-0)
debian/control (+2/-1)
debian/patches/0101-fix_pkglibdr_data.patch (+21/-0)
debian/patches/series (+1/-0)
To merge this branch: bzr merge lp:~l3on/ubuntu/precise/ivtools/fix-ftbfs
Reviewer Review Type Date Requested Status
Ubuntu branches Pending
Review via email: mp+93734@code.launchpad.net

Description of the change

A new patch replaces pkglib_DATA in Makefile.am to fix FTBFS with automake 1.11.3.

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== added directory '.pc/0101-fix_pkglibdr_data.patch'
2=== added file '.pc/0101-fix_pkglibdr_data.patch/.timestamp'
3=== added file '.pc/0101-fix_pkglibdr_data.patch/Makefile.am'
4--- .pc/0101-fix_pkglibdr_data.patch/Makefile.am 1970-01-01 00:00:00 +0000
5+++ .pc/0101-fix_pkglibdr_data.patch/Makefile.am 2012-02-19 15:11:19 +0000
6@@ -0,0 +1,817 @@
7+## To Do: Document all this stuff.
8+
9+## Miscellaneous Notes
10+
11+## Cannot put the main Makefile.am in src/Makefile.am because targets
12+## like drawtool clash with pre-existing directories of the same name.
13+## Maybe there is a way to push these generated executables in a
14+## subdirectory?
15+
16+## Various source files linked into the same target library sometimes
17+## require different options, in some cases in such a way that these
18+## options cannot be combined into a single set of options that works
19+## for all the files. This is addressed by breaking up such libraries
20+## into a few "convenience libtool libraries", each made of files
21+## compiled with identical options, and then combined to form the
22+## final library.
23+
24+## But unless the libFOO_la_SOURCES has a .cc file in it directly, as
25+## opposed to only indirectly via convenience libraries, it will be
26+## relinked during installation using gcc rather than g++, causing an
27+## error. So the first part of each broken-into-parts library is the
28+## library itself.
29+
30+## Removed linkage against external jpeg library, as it was not used.
31+
32+## Pending Issues:
33+
34+## Do
35+## TIFF/tiff.h TIFF/tiffio.h TIFF/format.h
36+## really belong in the installed include files, even when using an
37+## external tiff library?
38+
39+## Snatch the source code for refman.PS from the ivtools-doc CVS repo.
40+
41+## Comterp is compiled with ACE cpp options, but not linked to ACE.
42+
43+ACLOCAL_AMFLAGS = -I m4
44+
45+EXTRA_LTLIBRARIES =
46+
47+lib_LTLIBRARIES =
48+
49+# These must occur in *dependency order* to avoid an *install time*
50+# link error of this sort:
51+#
52+# /usr/bin/ld: cannot find -lAttribute
53+# collect2: ld returned 1 exit status
54+# libtool: install: error: relink `libComTerp.la' with the above command before installing it
55+#
56+# This is a longstanding known and undocumented bug. I would like to
57+# take this opportunity to thank the authors of the autotools suite.
58+#
59+# An appropriate ordering can be generated by running the script
60+# src/scripts/tsort-libs
61+
62+lib_LTLIBRARIES += libIV.la
63+lib_LTLIBRARIES += libUnidraw.la
64+lib_LTLIBRARIES += libComUtil.la
65+lib_LTLIBRARIES += libAttribute.la
66+lib_LTLIBRARIES += libIVGlyph.la
67+lib_LTLIBRARIES += libComTerp.la
68+lib_LTLIBRARIES += libAttrGlyph.la
69+lib_LTLIBRARIES += libComGlyph.la
70+lib_LTLIBRARIES += libTopoFace.la
71+lib_LTLIBRARIES += libUniIdraw.la
72+lib_LTLIBRARIES += libOverlayUnidraw.la
73+lib_LTLIBRARIES += libComUnidraw.la
74+lib_LTLIBRARIES += libFrameUnidraw.la
75+lib_LTLIBRARIES += libGraphUnidraw.la
76+lib_LTLIBRARIES += libUnidraw-common.la
77+lib_LTLIBRARIES += libTime.la
78+lib_LTLIBRARIES += libIV-common.la
79+lib_LTLIBRARIES += libDrawServ.la
80+if HAVE_LIBACE
81+lib_LTLIBRARIES += libAceDispatch.la
82+endif
83+
84+LIBVER = -version-info $(LIB_IV_VER)
85+
86+libAceDispatch_la_LDFLAGS = $(LIBVER)
87+libAttrGlyph_la_LDFLAGS = $(LIBVER)
88+libAttribute_la_LDFLAGS = $(LIBVER)
89+libComGlyph_la_LDFLAGS = $(LIBVER)
90+libComTerp_la_LDFLAGS = $(LIBVER)
91+libComUnidraw_la_LDFLAGS = $(LIBVER)
92+libComUtil_la_LDFLAGS = $(LIBVER)
93+libDrawServ_la_LDFLAGS = $(LIBVER)
94+libFrameUnidraw_la_LDFLAGS = $(LIBVER)
95+libGraphUnidraw_la_LDFLAGS = $(LIBVER)
96+libIVGlyph_la_LDFLAGS = $(LIBVER)
97+libIV_common_la_LDFLAGS = $(LIBVER)
98+libIV_la_LDFLAGS = $(LIBVER)
99+libOverlayUnidraw_la_LDFLAGS = $(LIBVER)
100+libTime_la_LDFLAGS = $(LIBVER)
101+libTopoFace_la_LDFLAGS = $(LIBVER)
102+libUniIdraw_la_LDFLAGS = $(LIBVER)
103+libUnidraw_common_la_LDFLAGS = $(LIBVER)
104+libUnidraw_la_LDFLAGS = $(LIBVER)
105+
106+if HAVE_LIBACE
107+ACEDISPATCH_LA = libAceDispatch.la
108+else
109+ACEDISPATCH_LA =
110+endif
111+
112+libAceDispatch_la_LIBADD = libIV.la $(ACE_LD)
113+libAttrGlyph_la_LIBADD = libAttribute.la libIVGlyph.la libUnidraw.la libIV.la
114+libAttribute_la_LIBADD = libUnidraw.la libIV.la libComUtil.la
115+libComGlyph_la_LIBADD = libAttribute.la libComTerp.la libIVGlyph.la libIV.la libComUtil.la
116+libComTerp_la_LIBADD = libAttribute.la libUnidraw.la libIV.la $(ACE_LD) libComUtil.la $(MATH_LD)
117+libComUnidraw_la_LIBADD = libAttribute.la libComGlyph.la libComTerp.la libIVGlyph.la libOverlayUnidraw.la libUniIdraw.la libUnidraw.la libIV.la $(ACE_LD) libComUtil.la $(X11_LD)
118+libComUtil_la_LIBADD =
119+libDrawServ_la_LIBADD = libAttribute.la libComTerp.la libComUnidraw.la libFrameUnidraw.la libGraphUnidraw.la libIVGlyph.la libOverlayUnidraw.la libTopoFace.la libUniIdraw.la libUnidraw.la libIV.la libComUtil.la $(ACE_LD)
120+libFrameUnidraw_la_LIBADD = libAttribute.la libComGlyph.la libComTerp.la libComUnidraw.la libIVGlyph.la libOverlayUnidraw.la libUniIdraw.la libUnidraw.la libIV.la libComUtil.la
121+libGraphUnidraw_la_LIBADD = libAttribute.la libComTerp.la libComUnidraw.la libIVGlyph.la libOverlayUnidraw.la libTopoFace.la libUniIdraw.la libUnidraw.la libIV.la libComUtil.la
122+libIVGlyph_la_LIBADD = libIV.la $(X11_LD)
123+libIV_common_la_LIBADD =
124+libIV_la_LIBADD = $(TIFF_LD) $(XEXT_LD) $(X11_LD) $(MATH_LD)
125+libOverlayUnidraw_la_LIBADD = libAttrGlyph.la libAttribute.la libComGlyph.la libComTerp.la libIVGlyph.la libTopoFace.la libUniIdraw.la libUnidraw.la libIV.la $(ACE_LD) libComUtil.la $(X11_LD) $(MATH_LD)
126+libTime_la_LIBADD = libIVGlyph.la libIV.la
127+libTopoFace_la_LIBADD = libUnidraw.la libIV.la
128+libUniIdraw_la_LIBADD = libUnidraw.la libIV.la
129+libUnidraw_common_la_LIBADD = libIV.la
130+libUnidraw_la_LIBADD = libIV.la $(X11_LD)
131+
132+IVSTD_INCLUDES = -Isrc -Isrc/include -Isrc/include/ivstd
133+IV2_6_INCLUDES = -Div2_6_compatible -Isrc -Isrc/include/IV-2_6 -Isrc/include -Isrc/include/ivstd
134+
135+### libComTerp
136+
137+libComTerp_parts = libComTerpPART1.la libComTerpPART2.la
138+libComTerp_la_LIBADD += $(libComTerp_parts)
139+EXTRA_LTLIBRARIES += $(libComTerp_parts)
140+
141+libComTerp_la_SOURCES = src/ComTerp/comhandler.cc \
142+src/ComTerp/comterpserv.cc src/ComTerp/ctrlfunc.cc
143+
144+libComTerp_la_CPPFLAGS = \
145+ $(ACE_INLINE_CPPFLAGS) \
146+ -Dcplusplus_2_1 $(IVSTD_INCLUDES)
147+
148+libComTerpPART1_la_SOURCES = src/ComTerp/assignfunc.cc \
149+src/ComTerp/bitfunc.cc src/ComTerp/boolfunc.cc \
150+src/ComTerp/bquotefunc.cc src/ComTerp/charfunc.cc \
151+src/ComTerp/comfunc.cc src/ComTerp/comvalue.cc src/ComTerp/condfunc.cc \
152+src/ComTerp/debugfunc.cc src/ComTerp/dotfunc.cc \
153+src/ComTerp/helpfunc.cc src/ComTerp/iofunc.cc src/ComTerp/listfunc.cc \
154+src/ComTerp/mathfunc.cc src/ComTerp/numfunc.cc src/ComTerp/parser.cc \
155+src/ComTerp/postfunc.cc src/ComTerp/randfunc.cc src/ComTerp/scanner.cc \
156+src/ComTerp/statfunc.cc src/ComTerp/strmfunc.cc \
157+src/ComTerp/symbolfunc.cc src/ComTerp/typefunc.cc \
158+src/ComTerp/xformfunc.cc
159+
160+libComTerpPART1_la_CPPFLAGS = \
161+ $(ACE_CPPFLAGS) -Dcplusplus_2_1 $(IVSTD_INCLUDES)
162+
163+libComTerpPART2_la_SOURCES = src/ComTerp/comterp.cc
164+
165+libComTerpPART2_la_CPPFLAGS = \
166+ -Div2_6_incompatible -Isrc/include \
167+ $(ACE_CPPFLAGS) -Dcplusplus_2_1 $(IVSTD_INCLUDES)
168+
169+### libIV_common
170+
171+libIV_common_la_SOURCES = src/OS/listimpl.cc src/OS/math.cc \
172+src/OS/memory.cc src/InterViews/regexp.cc src/InterViews/resource.cc \
173+src/OS/string.cc src/IV-2_6/textbuffer.cc src/IV-2_6/tform2_6.cc \
174+src/InterViews/transformer.cc
175+
176+libIV_common_la_CPPFLAGS = \
177+ -Dcplusplus_2_1 $(IVSTD_INCLUDES)
178+
179+### libTime
180+
181+libTime_la_SOURCES = src/Time/Date.cc src/Time/obstime.cc \
182+src/Time/Time.cc src/Time/timeglyph.cc
183+
184+libTime_la_CPPFLAGS = \
185+ -Dcplusplus_2_1 $(IVSTD_INCLUDES)
186+
187+### libIVGlyph
188+
189+libIVGlyph_la_SOURCES = src/IVGlyph/bdfltform.cc \
190+src/IVGlyph/bdtable.cc src/IVGlyph/bdvalue.cc src/IVGlyph/boolform.cc \
191+src/IVGlyph/charfield.cc src/IVGlyph/dragedit.cc \
192+src/IVGlyph/enumform.cc src/IVGlyph/exportchooser.cc \
193+src/IVGlyph/fieldedit.cc src/IVGlyph/figure.cc src/IVGlyph/gdialogs.cc \
194+src/IVGlyph/globals.cc src/IVGlyph/idraw.cc \
195+src/IVGlyph/importchooser.cc src/IVGlyph/namestate.cc \
196+src/IVGlyph/observables.cc src/IVGlyph/odialogs.cc \
197+src/IVGlyph/ofilechooser.cc src/IVGlyph/printchooser.cc \
198+src/IVGlyph/saveaschooser.cc src/IVGlyph/scrollable.cc \
199+src/IVGlyph/strchooser.cc src/IVGlyph/stredit.cc \
200+src/IVGlyph/strlist.cc src/IVGlyph/textbuff.cc src/IVGlyph/textedit.cc \
201+src/IVGlyph/texteditor.cc src/IVGlyph/textform.cc \
202+src/IVGlyph/textview.cc src/IVGlyph/textwindow.cc \
203+src/IVGlyph/toolbutton.cc src/IVGlyph/valuator.cc
204+
205+libIVGlyph_la_CPPFLAGS = \
206+ -Dcplusplus_2_1 $(IVSTD_INCLUDES)
207+
208+### libDrawServ
209+
210+libDrawServ_parts = libDrawServPART1.la libDrawServPART2.la
211+libDrawServ_la_LIBADD += $(libDrawServ_parts)
212+EXTRA_LTLIBRARIES += $(libDrawServ_parts)
213+
214+libDrawServ_la_SOURCES = src/DrawServ/ackback-handler.cc \
215+src/DrawServ/drawfunc.cc src/DrawServ/drawlink.cc \
216+src/DrawServ/drawserv-handler.cc
217+
218+libDrawServ_la_CPPFLAGS = \
219+ -Dcplusplus_2_1 $(ACE_INLINE_CPPFLAGS) $(IV2_6_INCLUDES)
220+
221+libDrawServPART1_la_SOURCES = src/DrawServ/drawcatalog.cc \
222+src/DrawServ/drawcmds.cc src/DrawServ/drawcomps.cc \
223+src/DrawServ/drawcreator.cc src/DrawServ/draweditor.cc \
224+src/DrawServ/drawlinkcomp.cc src/DrawServ/drawlinklist.cc \
225+src/DrawServ/drawserv.cc src/DrawServ/drawviews.cc \
226+src/DrawServ/grid.cc src/DrawServ/gridlist.cc \
227+src/DrawServ/linkselection.cc src/DrawServ/sid.cc
228+
229+libDrawServPART1_la_CPPFLAGS = \
230+ -Dcplusplus_2_1 $(ACE_CPPFLAGS) $(IV2_6_INCLUDES)
231+
232+libDrawServPART2_la_SOURCES = src/DrawServ/drawimport.cc \
233+src/DrawServ/drawkit.cc src/DrawServ/rcdialog.cc
234+
235+libDrawServPART2_la_CPPFLAGS = \
236+ -Dcplusplus_2_1 -Div2_6_incompatible \
237+ -Isrc/include $(ACE_CPPFLAGS) $(IV2_6_INCLUDES)
238+
239+### libUnidraw
240+
241+libUnidraw_common_la_SOURCES = src/Unidraw/component.cc \
242+src/Unidraw/compview.cc src/Unidraw/geomobjs.cc \
243+src/Unidraw/iterator.cc src/Unidraw/uarray.cc src/Unidraw/uhash.cc \
244+src/Unidraw/ulist.cc src/Unidraw/umap.cc
245+
246+libUnidraw_common_la_CPPFLAGS = \
247+ -Dcplusplus_2_1 -DUnidrawCommon $(IVSTD_INCLUDES)
248+
249+### libComUnidraw
250+
251+libComUnidraw_parts = libComUnidrawPART1.la
252+libComUnidraw_la_LIBADD += $(libComUnidraw_parts)
253+EXTRA_LTLIBRARIES += $(libComUnidraw_parts)
254+
255+libComUnidraw_la_SOURCES = src/ComUnidraw/comeditor.cc \
256+src/ComUnidraw/comterp-iohandler.cc src/ComUnidraw/dialogfunc.cc \
257+src/ComUnidraw/grdotfunc.cc src/ComUnidraw/grfunc.cc \
258+src/ComUnidraw/grlistfunc.cc src/ComUnidraw/groupfunc.cc \
259+src/ComUnidraw/grstatfunc.cc src/ComUnidraw/highlightfunc.cc \
260+src/ComUnidraw/nfunc.cc src/ComUnidraw/pixelfunc.cc \
261+src/ComUnidraw/plotfunc.cc src/ComUnidraw/unifunc.cc
262+
263+libComUnidraw_la_CPPFLAGS = \
264+ -Dcplusplus_2_1 $(ACE_CPPFLAGS) $(IV2_6_INCLUDES)
265+
266+libComUnidrawPART1_la_SOURCES = src/ComUnidraw/comterp-acehandler.cc
267+
268+libComUnidrawPART1_la_CPPFLAGS = \
269+ -Dcplusplus_2_1 $(ACE_INLINE_CPPFLAGS) \
270+ -Div2_6_incompatible -Isrc/include $(IV2_6_INCLUDES)
271+
272+### libComGlyph
273+
274+libComGlyph_la_SOURCES = src/ComGlyph/attrdialog.cc \
275+src/ComGlyph/comtextedit.cc src/ComGlyph/comtextview.cc \
276+src/ComGlyph/terpdialog.cc
277+
278+libComGlyph_la_CPPFLAGS = \
279+ -Dcplusplus_2_1 -Div2_6_incompatible -Isrc/include $(IVSTD_INCLUDES)
280+
281+### libIV
282+
283+libIV_parts = libIVPART1.la libIVPART2.la libIVPART3.la libIVPART4.la
284+libIV_la_LIBADD += $(libIV_parts)
285+EXTRA_LTLIBRARIES += $(libIV_parts)
286+
287+libIV_la_SOURCES = src/InterViews/session.cc
288+
289+libIV_la_CPPFLAGS = \
290+ -Dcplusplus_2_1 \
291+ -DABSLIBALLDIR='"$(pkglibdir)"' \
292+ -DRELLIBALLDIR='"lib/$(PACKAGE)"' \
293+ -DX_LIBDIR='"$(libdir)"' \
294+ -Isrc/IV $(IVSTD_INCLUDES)
295+
296+libIVPART1_la_SOURCES = src/InterViews/psfont.cc
297+
298+libIVPART1_la_CPPFLAGS = \
299+ -Dcplusplus_2_1 \
300+ -Dps_metrics_dir='"$(PSFontDir)"' \
301+ -Isrc/IV $(IVSTD_INCLUDES)
302+
303+libIVPART2_la_SOURCES = src/InterViews/dialogs.cc src/InterViews/kit.cc
304+
305+libIVPART2_la_CPPFLAGS = \
306+ -Dcplusplus_2_1 -Dsgi_motif_kit -Dmotif_kit -Ddefault_kit=SMFKit \
307+ -Isrc/IV $(IVSTD_INCLUDES)
308+
309+libIVPART3_la_SOURCES = src/Dispatch/dispatcher.cc \
310+src/Dispatch/iohandler.cc src/IV-2_6/adjuster2_6.cc \
311+src/IV-2_6/banner.cc src/IV-2_6/border2_6.cc src/IV-2_6/box2_6.cc \
312+src/IV-2_6/button2_6.cc src/IV-2_6/compeditor.cc src/IV-2_6/control.cc \
313+src/IV-2_6/deck2_6.cc src/IV-2_6/dialog2_6.cc \
314+src/IV-2_6/filebrowser.cc src/IV-2_6/filechooser.cc \
315+src/IV-2_6/frame.cc src/IV-2_6/glue2_6.cc src/IV-2_6/interactor.cc \
316+src/IV-2_6/matcheditor.cc src/IV-2_6/menu2_6.cc src/IV-2_6/message.cc \
317+src/IV-2_6/painter.cc src/IV-2_6/panner2_6.cc \
318+src/IV-2_6/perspective.cc src/IV-2_6/rubband.cc src/IV-2_6/rubcurve.cc \
319+src/IV-2_6/rubgroup.cc src/IV-2_6/rubline.cc src/IV-2_6/rubrect.cc \
320+src/IV-2_6/rubverts.cc src/IV-2_6/scene.cc src/IV-2_6/scrollbar2_6.cc \
321+src/IV-2_6/scroller2_6.cc src/IV-2_6/sensor.cc src/IV-2_6/shape.cc \
322+src/IV-2_6/strbrowser.cc src/IV-2_6/strchooser.cc \
323+src/IV-2_6/streditor.cc src/IV-2_6/subject.cc src/IV-2_6/textbuffer.cc \
324+src/IV-2_6/textdisplay.cc src/IV-2_6/texteditor.cc \
325+src/IV-2_6/tform2_6.cc src/IV-2_6/tray.cc src/IV-2_6/viewport.cc \
326+src/IV-2_6/world.cc src/IV-2_6/xbitmap2_6.cc src/IV-2_6/xevent2_6.cc \
327+src/IV-2_6/xinter.cc src/IV-2_6/xpainter.cc src/IV-2_6/xpattern.cc \
328+src/IV-X11/xbitmap.cc src/IV-X11/xbrush.cc src/IV-X11/xcanvas.cc \
329+src/IV-X11/xcolor.cc src/IV-X11/xcursor.cc src/IV-X11/xdrag.cc \
330+src/IV-X11/xevent.cc src/IV-X11/xfont.cc src/IV-X11/xraster.cc \
331+src/IV-X11/xreqerr.cc src/IV-X11/xselection.cc src/IV-X11/xwindow.cc \
332+src/InterViews/action.cc src/InterViews/adjust.cc \
333+src/InterViews/aggr.cc src/InterViews/align.cc \
334+src/InterViews/alloctbl.cc src/InterViews/arrcomp.cc \
335+src/InterViews/background.cc src/InterViews/bevel.cc \
336+src/InterViews/border.cc src/InterViews/box.cc \
337+src/InterViews/browser.cc src/InterViews/button.cc \
338+src/InterViews/character.cc src/InterViews/composition.cc \
339+src/InterViews/compositor.cc src/InterViews/debug.cc \
340+src/InterViews/deck.cc src/InterViews/fbrowser.cc \
341+src/InterViews/fchooser.cc src/InterViews/field.cc \
342+src/InterViews/geometry.cc src/InterViews/glyph.cc \
343+src/InterViews/group.cc src/InterViews/handler.cc \
344+src/InterViews/hit.cc src/InterViews/image.cc src/InterViews/input.cc \
345+src/InterViews/label.cc src/InterViews/layout.cc \
346+src/InterViews/lrmarker.cc src/InterViews/menu.cc \
347+src/InterViews/mf_dialogs.cc src/InterViews/mf_kit.cc \
348+src/InterViews/mono_kit.cc src/InterViews/monoglyph.cc \
349+src/InterViews/observe.cc src/InterViews/ol_dialogs.cc \
350+src/InterViews/ol_kit.cc src/InterViews/page.cc \
351+src/InterViews/patch.cc src/InterViews/place.cc \
352+src/InterViews/polyglyph.cc src/InterViews/printer.cc \
353+src/InterViews/regexp.cc src/InterViews/resource.cc \
354+src/InterViews/rule.cc src/InterViews/scrbox.cc \
355+src/InterViews/shadow.cc src/InterViews/simpcomp.cc \
356+src/InterViews/slider.cc src/InterViews/smf_kit.cc \
357+src/InterViews/stencil.cc src/InterViews/stepper.cc \
358+src/InterViews/style.cc src/InterViews/superpose.cc \
359+src/InterViews/target.cc src/InterViews/telltale.cc \
360+src/InterViews/texcomp.cc src/InterViews/tformsetter.cc \
361+src/InterViews/tile.cc src/InterViews/transformer.cc \
362+src/InterViews/xymarker.cc src/OS/directory.cc src/OS/file.cc \
363+src/OS/host.cc src/OS/listimpl.cc src/OS/math.cc src/OS/memory.cc \
364+src/OS/string.cc src/OS/ustring.cc
365+
366+libIVPART3_la_CPPFLAGS = \
367+ -Dcplusplus_2_1 -Isrc/IV $(IVSTD_INCLUDES)
368+
369+libIVPART4_la_SOURCES = src/InterViews/tiff.cc
370+
371+libIVPART4_la_CPPFLAGS = \
372+ -Dcplusplus_2_1 $(TIFF_LOC_CPPFLAG) -Isrc/IV $(IVSTD_INCLUDES)
373+
374+### libUnidraw
375+
376+libUnidraw_la_SOURCES = src/Unidraw/align.cc src/Unidraw/brushcmd.cc \
377+src/Unidraw/catalog.cc src/Unidraw/catcmds.cc src/Unidraw/cglue.cc \
378+src/Unidraw/clipboard.cc src/Unidraw/colorcmd.cc \
379+src/Unidraw/command.cc src/Unidraw/component.cc \
380+src/Unidraw/compview.cc src/Unidraw/connect.cc \
381+src/Unidraw/connector.cc src/Unidraw/creator.cc src/Unidraw/csolver.cc \
382+src/Unidraw/ctrlinfo.cc src/Unidraw/damage.cc src/Unidraw/data.cc \
383+src/Unidraw/datas.cc src/Unidraw/dialogs.cc src/Unidraw/edit.cc \
384+src/Unidraw/editor.cc src/Unidraw/editorinfo.cc src/Unidraw/ellipse.cc \
385+src/Unidraw/ellipses.cc src/Unidraw/externview.cc src/Unidraw/font.cc \
386+src/Unidraw/geomobjs.cc src/Unidraw/globals.cc src/Unidraw/graphic.cc \
387+src/Unidraw/grblock.cc src/Unidraw/grcomp.cc src/Unidraw/grcomptool.cc \
388+src/Unidraw/grid.cc src/Unidraw/grview.cc src/Unidraw/gvupdater.cc \
389+src/Unidraw/import.cc src/Unidraw/iterator.cc src/Unidraw/keymap.cc \
390+src/Unidraw/kybd.cc src/Unidraw/line.cc src/Unidraw/lines.cc \
391+src/Unidraw/link.cc src/Unidraw/macro.cc src/Unidraw/magnify.cc \
392+src/Unidraw/manip.cc src/Unidraw/manips.cc src/Unidraw/move.cc \
393+src/Unidraw/nop.cc src/Unidraw/pad.cc src/Unidraw/patcmd.cc \
394+src/Unidraw/path.cc src/Unidraw/picture.cc src/Unidraw/pin.cc \
395+src/Unidraw/polygon.cc src/Unidraw/polygons.cc src/Unidraw/pspaint.cc \
396+src/Unidraw/psview.cc src/Unidraw/rastercomp.cc \
397+src/Unidraw/rasterrect.cc src/Unidraw/rect.cc src/Unidraw/reshape.cc \
398+src/Unidraw/rotate.cc src/Unidraw/scale.cc src/Unidraw/select.cc \
399+src/Unidraw/selection.cc src/Unidraw/slot.cc src/Unidraw/spline.cc \
400+src/Unidraw/splines.cc src/Unidraw/statevar.cc \
401+src/Unidraw/statevars.cc src/Unidraw/stateview.cc \
402+src/Unidraw/stateviews.cc src/Unidraw/stencilcomp.cc \
403+src/Unidraw/stretch.cc src/Unidraw/struct.cc src/Unidraw/text.cc \
404+src/Unidraw/tool.cc src/Unidraw/transfn.cc src/Unidraw/transfns.cc \
405+src/Unidraw/transforms.cc src/Unidraw/uarray.cc src/Unidraw/uctrl.cc \
406+src/Unidraw/uctrls.cc src/Unidraw/uhash.cc src/Unidraw/ulabel.cc \
407+src/Unidraw/ulist.cc src/Unidraw/umap.cc src/Unidraw/unidraw.cc \
408+src/Unidraw/upage.cc src/Unidraw/ustencil.cc src/Unidraw/vertices.cc \
409+src/Unidraw/verts.cc src/Unidraw/viewcmds.cc src/Unidraw/viewer.cc
410+
411+libUnidraw_la_CPPFLAGS = \
412+ -Dcplusplus_2_1 $(IVSTD_INCLUDES)
413+
414+### libAttrGlyph
415+
416+libAttrGlyph_la_SOURCES = src/AttrGlyph/attredit.cc
417+
418+libAttrGlyph_la_CPPFLAGS = \
419+ -Dcplusplus_2_1 \
420+ -DLibStdCPlusPlus2=0 -DLibStdCPlusPlus3=1 \
421+ $(IVSTD_INCLUDES)
422+
423+### libComUtil
424+
425+libComUtil_parts = libComUtilPART1.la
426+libComUtil_la_LIBADD += $(libComUtil_parts)
427+EXTRA_LTLIBRARIES += $(libComUtil_parts)
428+
429+libComUtil_la_SOURCES = src/ComUtil/atox.c src/ComUtil/comerr.c \
430+src/ComUtil/dmm.c src/ComUtil/errfile.c src/ComUtil/funcptrs.c \
431+src/ComUtil/_lexscan.c src/ComUtil/mblock.c src/ComUtil/optable.c \
432+src/ComUtil/_parser.c src/ComUtil/_scanner.c src/ComUtil/symbols.c \
433+src/ComUtil/txtutil.c src/ComUtil/types.c src/ComUtil/util.c \
434+src/ComUtil/xdll.c
435+
436+libComUtil_la_CPPFLAGS = \
437+ -D_POSIX_C_SOURCE $(IVSTD_INCLUDES)
438+
439+libComUtilPART1_la_SOURCES = src/ComUtil/errsys.c
440+
441+# was hardwired:
442+# -DABSLIBALLDIR=\"/usr/lib/ivtools/\"
443+# -DRELLIBALLDIR=\"lib/ivtools/\"
444+
445+libComUtilPART1_la_CPPFLAGS = \
446+ -DABSLIBALLDIR=\"$(pkglibdir)/\" \
447+ -DRELLIBALLDIR=\"lib/$(PACKAGE)/\" \
448+ -D_POSIX_C_SOURCE $(IVSTD_INCLUDES)
449+
450+# NOTE: inconsistency in whether ABSLIBALLDIR has a trailing slash
451+
452+### libTopoFace
453+
454+libTopoFace_la_SOURCES = src/TopoFace/fgeomobjs.cc \
455+src/TopoFace/topoedge.cc src/TopoFace/topoedgelist.cc \
456+src/TopoFace/topoelt.cc src/TopoFace/topoface.cc \
457+src/TopoFace/toponode.cc
458+
459+libTopoFace_la_CPPFLAGS = \
460+ -Dcplusplus_2_1 $(IVSTD_INCLUDES)
461+
462+### libUniIdraw
463+
464+libUniIdraw_la_SOURCES = src/UniIdraw/idarrow.cc \
465+src/UniIdraw/idarrowhead.cc src/UniIdraw/idarrows.cc \
466+src/UniIdraw/idcatalog.cc src/UniIdraw/idcmds.cc \
467+src/UniIdraw/idcomp.cc src/UniIdraw/idcreator.cc \
468+src/UniIdraw/iddialogs.cc src/UniIdraw/ided.cc src/UniIdraw/idkybd.cc \
469+src/UniIdraw/idvars.cc
470+
471+libUniIdraw_la_CPPFLAGS = \
472+ -Dcplusplus_2_1 $(IV2_6_INCLUDES)
473+
474+### libGraphUnidraw
475+
476+libGraphUnidraw_parts = libGraphUnidrawPART1.la
477+libGraphUnidraw_la_LIBADD += $(libGraphUnidraw_parts)
478+EXTRA_LTLIBRARIES += $(libGraphUnidraw_parts)
479+
480+libGraphUnidraw_la_SOURCES = src/GraphUnidraw/edgecomp.cc \
481+src/GraphUnidraw/graphcatalog.cc src/GraphUnidraw/graphcmds.cc \
482+src/GraphUnidraw/graphcomp.cc src/GraphUnidraw/graphcreator.cc \
483+src/GraphUnidraw/graphdata.cc src/GraphUnidraw/grapheditor.cc \
484+src/GraphUnidraw/graphtools.cc src/GraphUnidraw/nodecomp.cc
485+
486+libGraphUnidraw_la_CPPFLAGS = \
487+ -Dcplusplus_2_1 $(IV2_6_INCLUDES)
488+
489+libGraphUnidrawPART1_la_SOURCES = src/GraphUnidraw/graphdialog.cc \
490+src/GraphUnidraw/graphimport.cc src/GraphUnidraw/graphkit.cc
491+
492+libGraphUnidrawPART1_la_CPPFLAGS = \
493+ -Dcplusplus_2_1 \
494+ -Div2_6_incompatible -Isrc/include $(IV2_6_INCLUDES)
495+
496+# libFrameUnidraw
497+
498+libFrameUnidraw_parts = libFrameUnidrawPART1.la
499+libFrameUnidraw_la_LIBADD += $(libFrameUnidraw_parts)
500+EXTRA_LTLIBRARIES += $(libFrameUnidraw_parts)
501+
502+libFrameUnidraw_la_SOURCES = src/FrameUnidraw/framecatalog.cc \
503+src/FrameUnidraw/framecmds.cc src/FrameUnidraw/framecomps.cc \
504+src/FrameUnidraw/framecreator.cc src/FrameUnidraw/frameeditor.cc \
505+src/FrameUnidraw/framefile.cc src/FrameUnidraw/framefunc.cc \
506+src/FrameUnidraw/frameps.cc src/FrameUnidraw/framescripts.cc \
507+src/FrameUnidraw/frameviewer.cc src/FrameUnidraw/frameviews.cc
508+
509+libFrameUnidraw_la_CPPFLAGS = \
510+ -Dcplusplus_2_1 $(IV2_6_INCLUDES)
511+
512+libFrameUnidrawPART1_la_SOURCES = src/FrameUnidraw/frameimport.cc \
513+src/FrameUnidraw/framekit.cc src/FrameUnidraw/framestates.cc
514+
515+libFrameUnidrawPART1_la_CPPFLAGS = \
516+ -Dcplusplus_2_1 -Div2_6_incompatible -Isrc/include $(IV2_6_INCLUDES)
517+
518+### libOverlayUnidraw
519+
520+# in directory but not included in build:
521+# src/OverlayUnidraw/cliplinepoly.cc
522+# src/OverlayUnidraw/clippoly.cc
523+# src/OverlayUnidraw/ovclip.cc
524+
525+libOverlayUnidraw_parts = libOverlayUnidrawPART1.la libOverlayUnidrawPART2.la
526+libOverlayUnidraw_la_LIBADD += $(libOverlayUnidraw_parts)
527+EXTRA_LTLIBRARIES += $(libOverlayUnidraw_parts)
528+
529+libOverlayUnidraw_la_SOURCES = src/OverlayUnidraw/attrtool.cc \
530+src/OverlayUnidraw/clipline.cc src/OverlayUnidraw/grayraster.cc \
531+src/OverlayUnidraw/indexmixins.cc src/OverlayUnidraw/leafwalker.cc \
532+src/OverlayUnidraw/ovadjuster.cc src/OverlayUnidraw/ovarrow.cc \
533+src/OverlayUnidraw/ovcatalog.cc src/OverlayUnidraw/ovcomps.cc \
534+src/OverlayUnidraw/ovcreator.cc src/OverlayUnidraw/ovdamage.cc \
535+src/OverlayUnidraw/ovdialog.cc src/OverlayUnidraw/ovdoer.cc \
536+src/OverlayUnidraw/oved.cc src/OverlayUnidraw/ovellipse.cc \
537+src/OverlayUnidraw/ovfile.cc src/OverlayUnidraw/ovhull.cc \
538+src/OverlayUnidraw/ovline.cc src/OverlayUnidraw/ovmanips.cc \
539+src/OverlayUnidraw/ovpage.cc src/OverlayUnidraw/ovpainter.cc \
540+src/OverlayUnidraw/ovpanner.cc src/OverlayUnidraw/ovpolygon.cc \
541+src/OverlayUnidraw/ovprecise.cc src/OverlayUnidraw/ovpspict.cc \
542+src/OverlayUnidraw/ovpsview.cc src/OverlayUnidraw/ovraster.cc \
543+src/OverlayUnidraw/ovrect.cc src/OverlayUnidraw/ovrestimage.cc \
544+src/OverlayUnidraw/ovselect.cc src/OverlayUnidraw/ovselection.cc \
545+src/OverlayUnidraw/ovspline.cc src/OverlayUnidraw/ovstates.cc \
546+src/OverlayUnidraw/ovstencil.cc src/OverlayUnidraw/ovtext.cc \
547+src/OverlayUnidraw/ovunidraw.cc src/OverlayUnidraw/ovvars.cc \
548+src/OverlayUnidraw/ovvertices.cc src/OverlayUnidraw/ovviewer.cc \
549+src/OverlayUnidraw/ovviews.cc src/OverlayUnidraw/ptinpoly.cc \
550+src/OverlayUnidraw/rastercmds.cc src/OverlayUnidraw/scriptview.cc \
551+src/OverlayUnidraw/textfile.cc src/OverlayUnidraw/annotate.cc
552+
553+libOverlayUnidraw_la_CPPFLAGS = \
554+ -Dcplusplus_2_1 $(ACE_CPPFLAGS) $(IV2_6_INCLUDES)
555+
556+libOverlayUnidrawPART1_la_SOURCES = src/OverlayUnidraw/grloctool.cc \
557+src/OverlayUnidraw/ovabout.cc src/OverlayUnidraw/ovcamcmds.cc \
558+src/OverlayUnidraw/ovchainview.cc src/OverlayUnidraw/ovcmds.cc \
559+src/OverlayUnidraw/ovctrl.cc src/OverlayUnidraw/ovexport.cc \
560+src/OverlayUnidraw/ovfixview.cc src/OverlayUnidraw/ovgdialog.cc \
561+src/OverlayUnidraw/ovimport.cc src/OverlayUnidraw/ovipcmds.cc \
562+src/OverlayUnidraw/ovkit.cc src/OverlayUnidraw/ovprint.cc \
563+src/OverlayUnidraw/ovshowhide.cc src/OverlayUnidraw/setattrbyexpr.cc \
564+src/OverlayUnidraw/slctbyattr.cc
565+
566+libOverlayUnidrawPART1_la_CPPFLAGS = \
567+ -Dcplusplus_2_1 -Div2_6_incompatible $(ACE_CPPFLAGS) \
568+ -Isrc/OverlayUnidraw -Isrc/include $(IV2_6_INCLUDES)
569+
570+libOverlayUnidrawPART2_la_SOURCES = src/OverlayUnidraw/aceimport.cc
571+
572+libOverlayUnidrawPART2_la_CPPFLAGS = \
573+ -Dcplusplus_2_1 -Div2_6_incompatible -Isrc/include \
574+ $(ACE_INLINE_CPPFLAGS) $(IV2_6_INCLUDES)
575+
576+### libAceDispatch
577+
578+libAceDispatch_la_SOURCES = src/AceDispatch/ace_dispatcher.cc \
579+src/AceDispatch/ace_iohandler.cc
580+
581+libAceDispatch_la_CPPFLAGS = \
582+ -Dcplusplus_2_1 $(ACE_CPPFLAGS) $(IVSTD_INCLUDES)
583+
584+### libAttribute
585+
586+libAttribute_la_SOURCES = src/Attribute/alist.cc \
587+src/Attribute/aliterator.cc src/Attribute/attribute.cc \
588+src/Attribute/attrlist.cc src/Attribute/attrvalue.cc \
589+src/Attribute/commodule.cc src/Attribute/lexscan.cc \
590+src/Attribute/paramlist.cc
591+
592+libAttribute_la_CPPFLAGS = \
593+ -Dcplusplus_2_1 $(IVSTD_INCLUDES)
594+
595+### libTIFF
596+
597+if HAVE_LIBTIFF
598+# use external tiff library
599+TIFF_LOC_CPPFLAG = -DEXTERN_TIFF
600+else
601+# build internal tiff library
602+lib_LTLIBRARIES += libTIFF.la
603+TIFF_LOC_CPPFLAG =
604+endif
605+
606+libTIFF_la_SOURCES = src/TIFF/tif_aux.c src/TIFF/tif_ccittrle.c \
607+src/TIFF/tif_close.c src/TIFF/tif_compat.c src/TIFF/tif_compress.c \
608+src/TIFF/tif_dir.c src/TIFF/tif_dirinfo.c src/TIFF/tif_dirread.c \
609+src/TIFF/tif_dirwrite.c src/TIFF/tif_dumpmode.c src/TIFF/tif_error.c \
610+src/TIFF/tif_fax3.c src/TIFF/tif_fax4.c src/TIFF/tif_flush.c \
611+src/TIFF/tif_getimage.c src/TIFF/tif_jpeg.c src/TIFF/tif_lzw.c \
612+src/TIFF/tif_next.c src/TIFF/tif_open.c src/TIFF/tif_packbits.c \
613+src/TIFF/tif_print.c src/TIFF/tif_read.c src/TIFF/tif_strip.c \
614+src/TIFF/tif_swab.c src/TIFF/tif_thunder.c src/TIFF/tif_tile.c \
615+src/TIFF/tif_version.c src/TIFF/tif_warning.c src/TIFF/tif_write.c
616+
617+# Not in libTIFF:
618+# src/TIFF/mkg3states.c src/TIFF/mkspans.c
619+# src/TIFF/tif_machdep.c
620+
621+libTIFF_la_CPPFLAGS = -Isrc/TIFF -Isrc/include/TIFF -Isrc/include
622+
623+tif_fax3.$(OBJEXT) : g3states.h
624+.libs/libTIFF_la-tif_fax3.lo: g3states.h
625+
626+g3states.h: mkg3states
627+ ./mkg3states > $@
628+
629+mkg3states: src/TIFF/mkg3states.c
630+ $(CC) -o $@ $<
631+
632+### libACE Support
633+
634+if HAVE_LIBACE
635+ACE_CPPFLAGS = -DHAVE_ACE
636+ACE_INLINE_CPPFLAGS = -D__ACE_INLINE__ $(ACE_CPPFLAGS)
637+else
638+ACE_CPPFLAGS =
639+ACE_INLINE_CPPFLAGS =
640+endif
641+
642+### Support files
643+
644+pkglib_DATA = src/ComUtil/comterp.err Idemo InterViews
645+
646+Idemo: src/idemo/Idemo.defaults
647+ cp $< $@
648+
649+InterViews: src/IV/InterViews.defaults
650+ cp $< $@
651+
652+### binaries
653+
654+bin_SCRIPTS = ivgetjpg ivtiftopnm pnmtopgm
655+
656+ivgetjpg: src/scripts/ivgetjpg.bash
657+ cp $< $@
658+ chmod a+x $@
659+
660+ivtiftopnm: src/scripts/ivtiftopnm.bash
661+ cp $< $@
662+ chmod a+x $@
663+
664+pnmtopgm: src/scripts/pnmtopgm.sh
665+ cp $< $@
666+ chmod a+x $@
667+
668+bin_PROGRAMS = comdraw comterp comtest dclock drawserv drawtool \
669+flipbook gclock glyphterp graphdraw iclass idemo idraw ivtext ivtmpnam \
670+stdcmapppm
671+
672+comdraw_SOURCES = src/comdraw/main.cc
673+comterp_SOURCES = src/comterp_/main.cc
674+comtest_SOURCES = src/comtest/main.cc
675+dclock_SOURCES = src/dclock/clocktime.cc src/dclock/clocktime.h \
676+src/dclock/data.cc src/dclock/data.h src/dclock/dclock.cc \
677+src/dclock/dclock.h src/dclock/dface.cc src/dclock/dface.h \
678+src/dclock/digit.cc src/dclock/digit.h src/dclock/segment.cc \
679+src/dclock/segment.h
680+drawserv_SOURCES = src/drawserv_/main.cc
681+drawtool_SOURCES = src/drawtool/main.cc
682+flipbook_SOURCES = src/flipbook/main.cc
683+gclock_SOURCES = src/glyphs/gclock/main.cc
684+glyphterp_SOURCES = src/glyphterp/main.cc
685+graphdraw_SOURCES = src/graphdraw/main.cc
686+iclass_SOURCES = src/iclass/classbuffer.cc src/iclass/classbuffer.h \
687+src/iclass/classeditor.cc src/iclass/classeditor.h \
688+src/iclass/classinfo.cc src/iclass/classinfo.h src/iclass/dialogs.cc \
689+src/iclass/dialogs.h src/iclass/direct.cc src/iclass/direct.h \
690+src/iclass/globals.cc src/iclass/globals.h src/iclass/iclass.cc \
691+src/iclass/iclass.h src/iclass/main.cc
692+idemo_SOURCES = src/idemo/main.cc
693+idraw_SOURCES = src/idraw/main.cc
694+ivtext_SOURCES = src/ivtext/main.cc
695+ivtmpnam_SOURCES = src/utils/ivtmpnam.c # C
696+stdcmapppm_SOURCES = src/utils/stdcmapppm.c # C
697+
698+
699+AM_CPPFLAGS = -Isrc/include
700+AM_CXXFLAGS = -Wno-write-strings -Wno-deprecated
701+
702+
703+## Giving per-object flags ensures that all the "main.o" files have
704+## different names. See info: (automake)Top > FAQ > Renamed Objects
705+
706+comdraw_CPPFLAGS = -Dcplusplus_2_1 $(ACE_INLINE_CPPFLAGS) $(IV2_6_INCLUDES)
707+comterp_CPPFLAGS = -Dcplusplus_2_1 $(ACE_INLINE_CPPFLAGS) $(IVSTD_INCLUDES)
708+comtest_CPPFLAGS = -Dcplusplus_2_1 $(ACE_CPPFLAGS) $(IVSTD_INCLUDES)
709+dclock_CPPFLAGS = -Dcplusplus_2_1 $(IV2_6_INCLUDES)
710+drawserv_CPPFLAGS = -Dcplusplus_2_1 $(ACE_INLINE_CPPFLAGS) $(IV2_6_INCLUDES)
711+drawtool_CPPFLAGS = -Dcplusplus_2_1 $(ACE_INLINE_CPPFLAGS) $(IV2_6_INCLUDES)
712+flipbook_CPPFLAGS = -Dcplusplus_2_1 $(ACE_CPPFLAGS) $(IV2_6_INCLUDES)
713+gclock_CPPFLAGS = -Dcplusplus_2_1 -Isrc/glyphs $(IVSTD_INCLUDES)
714+glyphterp_CPPFLAGS = -Dcplusplus_2_1 $(ACE_CPPFLAGS) $(IVSTD_INCLUDES)
715+graphdraw_CPPFLAGS = -Dcplusplus_2_1 $(ACE_CPPFLAGS) $(IV2_6_INCLUDES)
716+iclass_CPPFLAGS = -Dcplusplus_2_1 $(IV2_6_INCLUDES)
717+idemo_CPPFLAGS = -Dcplusplus_2_1 $(IVSTD_INCLUDES)
718+idraw_CPPFLAGS = -Dcplusplus_2_1 $(IV2_6_INCLUDES)
719+ivtext_CPPFLAGS = -Dcplusplus_2_1 $(IVSTD_INCLUDES)
720+ivtmpnam_CPPFLAGS =
721+stdcmapppm_CPPFLAGS =
722+
723+# AM_LDFLAGS =
724+
725+comdraw_LDADD = libComUnidraw.la libComTerp.la libOverlayUnidraw.la libUnidraw.la $(ACEDISPATCH_LA) libIV.la $(ACE_LD)
726+comterp_LDADD = libComTerp.la libTopoFace.la libUnidraw.la $(ACE_LD)
727+comtest_LDADD = libAttribute.la libComTerp.la
728+dclock_LDADD = libIV.la
729+drawserv_LDADD = libDrawServ.la libFrameUnidraw.la libGraphUnidraw.la libOverlayUnidraw.la libComUnidraw.la libUnidraw.la libComTerp.la $(ACEDISPATCH_LA) libIV.la $(ACE_LD)
730+drawtool_LDADD = libAceDispatch.la libOverlayUnidraw.la libUnidraw.la libComTerp.la libIV.la $(ACE_LD)
731+flipbook_LDADD = libFrameUnidraw.la libComUnidraw.la libOverlayUnidraw.la libUnidraw.la libComTerp.la $(ACEDISPATCH_LA) libIV.la $(ACE_LD)
732+gclock_LDADD = libTime.la libIV.la
733+glyphterp_LDADD= libIVGlyph.la libComGlyph.la libIV.la
734+graphdraw_LDADD= libGraphUnidraw.la libComUnidraw.la libAceDispatch.la libComTerp.la libOverlayUnidraw.la libUnidraw.la libIV.la $(ACE_LD)
735+iclass_LDADD = libIV.la
736+idemo_LDADD = libIV.la
737+idraw_LDADD = libUniIdraw.la libUnidraw.la
738+ivtext_LDADD = libIVGlyph.la libIV.la
739+ivtmpnam_LDADD =
740+stdcmapppm_LDADD=
741+
742+### directories to recurse into, for installation of include files
743+
744+SUBDIRS = src src/include
745+
746+### man pages to install
747+
748+man_MANS = src/man/man1/drawtool.1 src/man/man1/iclass.1 \
749+src/man/man1/idraw.1 src/man/man1/comterp.1 src/man/man1/flipbook.1 \
750+src/man/man1/comdraw.1 src/man/man1/dclock.1 src/man/man1/graphdraw.1 \
751+src/man/man3/UArray.3 src/man/man3/RotateTool.3 \
752+src/man/man3/TextDisplay.3 src/man/man3/Banner.3 \
753+src/man/man3/TextComp.3 src/man/man3/ULabel.3 src/man/man3/Iterator.3 \
754+src/man/man3/KeyMap.3 src/man/man3/Dispatcher.3 \
755+src/man/man3/UHashTable.3 src/man/man3/GraphicView.3 \
756+src/man/man3/BasicDialog.3 src/man/man3/SlotComp.3 \
757+src/man/man3/ImportCmd.3 src/man/man3/UMap.3 src/man/man3/Scroller.3 \
758+src/man/man3/RpcService.3 src/man/man3/ScaleTool.3 \
759+src/man/man3/Message.3 src/man/man3/IOCallback.3 \
760+src/man/man3/PatternCmd.3 src/man/man3/Path.3 \
761+src/man/man3/ExternView.3 src/man/man3/ReqErr.3 src/man/man3/RpcHdr.3 \
762+src/man/man3/Tool.3 src/man/man3/lines.3 src/man/man3/Interactor.3 \
763+src/man/man3/FileChooser.3 src/man/man3/manips.3 \
764+src/man/man3/statevars.3 src/man/man3/EditorInfo.3 \
765+src/man/man3/CGlue.3 src/man/man3/align.3 src/man/man3/ellipses.3 \
766+src/man/man3/Editor.3 src/man/man3/UList.3 src/man/man3/Pattern.3 \
767+src/man/man3/iostreamb.3 src/man/man3/uctrls.3 \
768+src/man/man3/GraphicCompTool.3 src/man/man3/Command.3 \
769+src/man/man3/LinkComp.3 src/man/man3/splines.3 \
770+src/man/man3/SplineComp.3 src/man/man3/ComponentView.3 \
771+src/man/man3/MatchEditor.3 src/man/man3/pspaint.3 \
772+src/man/man3/rpcstream.3 src/man/man3/datas.3 src/man/man3/RpcReader.3 \
773+src/man/man3/Scene.3 src/man/man3/GraphicComp.3 \
774+src/man/man3/StretchTool.3 src/man/man3/Resource.3 \
775+src/man/man3/LineComp.3 src/man/man3/classes.3 src/man/man3/Tray.3 \
776+src/man/man3/Viewer.3 src/man/man3/Graphic.3 \
777+src/man/man3/MagnifyTool.3 src/man/man3/SelectTool.3 \
778+src/man/man3/CompletionEditor.3 src/man/man3/Painter.3 \
779+src/man/man3/TransferFunct.3 src/man/man3/Component.3 \
780+src/man/man3/Selection.3 src/man/man3/Frame.3 \
781+src/man/man3/Perspective.3 src/man/man3/viewcmds.3 \
782+src/man/man3/UnidrawIntro.3 src/man/man3/RpcRegistry.3 \
783+src/man/man3/Unidraw.3 src/man/man3/Page.3 src/man/man3/Viewport.3 \
784+src/man/man3/Vertices.3 src/man/man3/Regexp.3 src/man/man3/Clipboard.3 \
785+src/man/man3/Panner.3 src/man/man3/Picture.3 src/man/man3/transfns.3 \
786+src/man/man3/Damage.3 src/man/man3/StringEditor.3 \
787+src/man/man3/RpcWriter.3 src/man/man3/GraphicBlock.3 \
788+src/man/man3/GVUpdater.3 src/man/man3/RasterComp.3 \
789+src/man/man3/polygons.3 src/man/man3/stateviews.3 \
790+src/man/man3/Connector.3 src/man/man3/UControl.3 \
791+src/man/man3/Menu2_6.3 src/man/man3/World.3 src/man/man3/BrushCmd.3 \
792+src/man/man3/globals.3 src/man/man3/StrBrowser.3 src/man/man3/NOPCmd.3 \
793+src/man/man3/PolygonComp.3 src/man/man3/IOHandler.3 \
794+src/man/man3/Catalog.3 src/man/man3/RpcPeer.3 \
795+src/man/man3/EllipseComp.3 src/man/man3/UStencil.3 \
796+src/man/man3/StateVarView.3 src/man/man3/Dialog.3 \
797+src/man/man3/VerticesComp.3 src/man/man3/TextEditor.3 \
798+src/man/man3/kybd.3 src/man/man3/ConnectTool.3 src/man/man3/rpcbuf.3 \
799+src/man/man3/MacroCmd.3 src/man/man3/geomobjs.3 src/man/man3/struct.3 \
800+src/man/man3/edit.3 src/man/man3/RasterRect.3 src/man/man3/Control.3 \
801+src/man/man3/RectComp.3 src/man/man3/Border.3 src/man/man3/Shape.3 \
802+src/man/man3/PostScriptView.3 src/man/man3/FontCmd.3 \
803+src/man/man3/PinComp.3 src/man/man3/ColorCmd.3 src/man/man3/PadComp.3 \
804+src/man/man3/StrChooser.3 src/man/man3/Subject.3 \
805+src/man/man3/MoveTool.3 src/man/man3/ControlInfo.3 \
806+src/man/man3/catcmds.3 src/man/man3/Sensor.3 src/man/man3/Data.3 \
807+src/man/man3/Button2_6.3 src/man/man3/CSolver.3 src/man/man3/Creator.3 \
808+src/man/man3/ReshapeTool.3 src/man/man3/TextBuffer.3 \
809+src/man/man3/Grid.3 src/man/man3/StencilComp.3 src/man/man3/StateVar.3 \
810+src/man/man3/Box2_6.3 src/man/man3/Deck2_6.3 src/man/man3/Glue2_6.3 \
811+src/man/man3/Rubband.3 src/man/man3/Manipulator.3 \
812+src/man/man3/transforms.3 src/man/man3/FileBrowser.3 \
813+src/man/man3/Adjuster.3
814+
815+### other documentation
816+
817+if PS2PDF
818+doc_DATA = refman.pdf
819+refman.pdf: src/man/refman3.1/refman.PS
820+ $(ps2pdf) $< $@
821+else
822+doc_DATA = src/man/refman3.1/refman.PS
823+endif
824
825=== modified file '.pc/applied-patches'
826--- .pc/applied-patches 2011-06-26 14:50:38 +0000
827+++ .pc/applied-patches 2012-02-19 15:11:19 +0000
828@@ -8,3 +8,4 @@
829 0008-math_atan2_hypot.patch
830 0009-autoconf-guard-ioctl.patch
831 debian-changes-1.2.8a1-5
832+0101-fix_pkglibdr_data.patch
833
834=== modified file 'Makefile.am'
835--- Makefile.am 2011-05-21 00:14:18 +0000
836+++ Makefile.am 2012-02-19 15:11:19 +0000
837@@ -635,7 +635,8 @@
838
839 ### Support files
840
841-pkglib_DATA = src/ComUtil/comterp.err Idemo InterViews
842+programfilesdir = $(pkglibdir)
843+programfiles_DATA = src/ComUtil/comterp.err Idemo InterViews
844
845 Idemo: src/idemo/Idemo.defaults
846 cp $< $@
847
848=== modified file 'debian/changelog'
849--- debian/changelog 2011-11-13 15:06:25 +0000
850+++ debian/changelog 2012-02-19 15:11:19 +0000
851@@ -1,3 +1,10 @@
852+ivtools (1.2.8a1-5ubuntu1) precise; urgency=low
853+
854+ * Fix FTBFS with automake 1.11.3 replacing pkglib_DATA with new
855+ a new variable in Makefile.am (LP: #935186).
856+
857+ -- Leo Iannacone <l3on@ubuntu.com> Sun, 19 Feb 2012 00:27:49 +0100
858+
859 ivtools (1.2.8a1-5build1) precise; urgency=low
860
861 * No-change rebuild for libace-5.7.7 -> libace-6.0.1 transition.
862
863=== modified file 'debian/control'
864--- debian/control 2011-06-26 14:50:38 +0000
865+++ debian/control 2012-02-19 15:11:19 +0000
866@@ -11,7 +11,8 @@
867 libtiff4-dev | libtiff-dev, libace-dev,
868 ghostscript
869 Build-Conflicts: autoconf2.13, automake1.4
870-Maintainer: Barak A. Pearlmutter <bap@debian.org>
871+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
872+XSBC-Original-Maintainer: Barak A. Pearlmutter <bap@debian.org>
873 Standards-Version: 3.9.2.0
874 Homepage: http://www.ivtools.org
875 Vcs-Git: git://git.debian.org/git/collab-maint/ivtools.git
876
877=== added file 'debian/patches/0101-fix_pkglibdr_data.patch'
878--- debian/patches/0101-fix_pkglibdr_data.patch 1970-01-01 00:00:00 +0000
879+++ debian/patches/0101-fix_pkglibdr_data.patch 2012-02-19 15:11:19 +0000
880@@ -0,0 +1,21 @@
881+Description: Replacing pkglib_DATA in Makefile.am to fix FTBFS with
882+ automake 1.11.3.
883+Author: Leo Iannacone <l3on@ubuntu.com>
884+Bug-Ubuntu: https://bugs.launchpad.net/bugs/935186
885+
886+---
887+ Makefile.am | 3 ++-
888+ 1 file changed, 2 insertions(+), 1 deletion(-)
889+
890+--- ivtools.orig/Makefile.am
891++++ ivtools/Makefile.am
892+@@ -635,7 +635,8 @@ endif
893+
894+ ### Support files
895+
896+-pkglib_DATA = src/ComUtil/comterp.err Idemo InterViews
897++programfilesdir = $(pkglibdir)
898++programfiles_DATA = src/ComUtil/comterp.err Idemo InterViews
899+
900+ Idemo: src/idemo/Idemo.defaults
901+ cp $< $@
902
903=== modified file 'debian/patches/series'
904--- debian/patches/series 2011-06-26 14:50:38 +0000
905+++ debian/patches/series 2012-02-19 15:11:19 +0000
906@@ -8,3 +8,4 @@
907 0008-math_atan2_hypot.patch
908 0009-autoconf-guard-ioctl.patch
909 debian-changes-1.2.8a1-5
910+0101-fix_pkglibdr_data.patch

Subscribers

People subscribed via source and target branches

to all changes: