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

Subscribers

People subscribed via source and target branches

to all changes: