pkg://Guppi-0.40.3-13.src.rpm:1024883/Guppi-libs.patch
info downloads
diff -ru Guppi-0.40.3/libguppitank/Makefile.am Guppi-0.40.3-fixed/libguppitank/Makefile.am
--- Guppi-0.40.3/libguppitank/Makefile.am Tue Jan 8 00:50:53 2002
+++ Guppi-0.40.3-fixed/libguppitank/Makefile.am Thu Jan 31 16:48:29 2002
@@ -40,6 +40,7 @@
libguppitank_la_LDFLAGS = -version-info $(GUPPI_CURRENT):$(GUPPI_REVISION):$(GUPPI_AGE) $(EXTRA_LDFLAGS)
+libguppitank_la_LDADD = ../src/libguppi.la
noinst_PROGRAMS = demo demo2 demo-scatter
demo_SOURCES = demo.c
diff -ru Guppi-0.40.3/libguppitank/Makefile.in Guppi-0.40.3-fixed/libguppitank/Makefile.in
--- Guppi-0.40.3/libguppitank/Makefile.in Mon Jan 21 23:19:47 2002
+++ Guppi-0.40.3-fixed/libguppitank/Makefile.in Thu Jan 31 16:46:52 2002
@@ -209,6 +209,8 @@
libguppitank_la_LDFLAGS = -version-info $(GUPPI_CURRENT):$(GUPPI_REVISION):$(GUPPI_AGE) $(EXTRA_LDFLAGS)
+libguppitank_la_LDADD = ../src/libguppi.la
+
noinst_PROGRAMS = demo demo2 demo-scatter
demo_SOURCES = demo.c
demo2_SOURCES = demo2.c
@@ -344,7 +346,7 @@
maintainer-clean-libtool:
libguppitank.la: $(libguppitank_la_OBJECTS) $(libguppitank_la_DEPENDENCIES)
- $(LINK) -rpath $(libdir) $(libguppitank_la_LDFLAGS) $(libguppitank_la_OBJECTS) $(libguppitank_la_LIBADD) $(LIBS)
+ $(LINK) -rpath $(libdir) $(libguppitank_la_LDFLAGS) $(libguppitank_la_OBJECTS) $(libguppitank_la_LIBADD) $(LIBS) $(libguppitank_la_LDADD)
mostlyclean-noinstPROGRAMS:
diff -ru Guppi-0.40.3/src/Makefile.am Guppi-0.40.3-fixed/src/Makefile.am
--- Guppi-0.40.3/src/Makefile.am Thu Jan 17 00:41:19 2002
+++ Guppi-0.40.3-fixed/src/Makefile.am Thu Jan 31 16:39:03 2002
@@ -165,6 +165,8 @@
libguppiplot/guppi-text-tokens.lo \
libguppiplot/guppi-view-interval.lo
+libguppi_la_LDADD = libguppi_la_LDADD = -L$(libdir) -lxml -lgnomeui -lgnomeprint -lglade -lgtk
+
INCLUDES = \
-I$(top_builddir) -I$(includedir) -I$(top_srcdir) \
-I$(top_srcdir)/src/libguppiuseful \
diff -ru Guppi-0.40.3/src/Makefile.in Guppi-0.40.3-fixed/src/Makefile.in
--- Guppi-0.40.3/src/Makefile.in Mon Jan 21 23:19:27 2002
+++ Guppi-0.40.3-fixed/src/Makefile.in Thu Jan 31 16:30:12 2002
@@ -203,6 +203,7 @@
libguppi_la_LIBADD = libguppiuseful/gnan.lo libguppiuseful/guppi-2d.lo libguppiuseful/guppi-attribute-bag.lo libguppiuseful/guppi-attribute-flavor.lo libguppiuseful/guppi-attribute-widget.lo libguppiuseful/guppi-config-model.lo libguppiuseful/guppi-convenient.lo libguppiuseful/guppi-debug.lo libguppiuseful/guppi-defaults.lo libguppiuseful/guppi-dharma.lo libguppiuseful/guppi-dialogs.lo libguppiuseful/guppi-enums.lo libguppiuseful/guppi-file.lo libguppiuseful/guppi-fn-wrapper.lo libguppiuseful/guppi-garray.lo libguppiuseful/guppi-gpl.lo libguppiuseful/guppi-hash.lo libguppiuseful/guppi-matrix.lo libguppiuseful/guppi-memory.lo libguppiuseful/guppi-metric-entry.lo libguppiuseful/guppi-metrics.lo libguppiuseful/guppi-multiview.lo libguppiuseful/guppi-paths.lo libguppiuseful/guppi-plug-in-spec.lo libguppiuseful/guppi-plug-in.lo libguppiuseful/guppi-polynomial.lo libguppiuseful/guppi-rgb.lo libguppiuseful/guppi-stream-preview.lo libguppiuseful/guppi-stream.lo libguppiuseful/guppi-string.lo libguppiuseful/guppi-unique-id.lo libguppiuseful/guppi-useful-init.lo libguppiuseful/guppi-vector.lo libguppiuseful/guppi-version.lo libguppiuseful/guppi-xml.lo libguppispecfns/bdtr.lo libguppispecfns/btdtr.lo libguppispecfns/chdtr.lo libguppispecfns/choose.lo libguppispecfns/const.lo libguppispecfns/fdtr.lo libguppispecfns/gamma.lo libguppispecfns/gdtr.lo libguppispecfns/hypergeom.lo libguppispecfns/igam.lo libguppispecfns/igami.lo libguppispecfns/incbet.lo libguppispecfns/incbi.lo libguppispecfns/mtherr.lo libguppispecfns/nbdtr.lo libguppispecfns/ndtr.lo libguppispecfns/ndtri.lo libguppispecfns/pdtr.lo libguppispecfns/polyeval.lo libguppispecfns/stdtr.lo libguppispecfns/unity.lo libguppidata/guppi-category.lo libguppidata/guppi-curve.lo libguppidata/guppi-data-flavor.lo libguppidata/guppi-data-init.lo libguppidata/guppi-data-plug-in.lo libguppidata/guppi-data-socket.lo libguppidata/guppi-data-table.lo libguppidata/guppi-data-tree.lo libguppidata/guppi-data.lo libguppidata/guppi-date-indexed.lo libguppidata/guppi-date-series.lo libguppidata/guppi-price-series.lo libguppidata/guppi-seq-boolean.lo libguppidata/guppi-seq-categorical.lo libguppidata/guppi-seq-date.lo libguppidata/guppi-seq-integer.lo libguppidata/guppi-seq-object.lo libguppidata/guppi-seq-scalar.lo libguppidata/guppi-seq-string.lo libguppidata/guppi-seq.lo libguppidata/guppi-struct.lo libguppidata/guppi-data-importer.lo libguppidata/guppi-data-importer-plug-in.lo libguppidataimpl/guppi-dataimpl-init.lo libguppidataimpl/guppi-category-core.lo libguppidataimpl/guppi-curve-calc.lo libguppidataimpl/guppi-curve-func.lo libguppidataimpl/guppi-curve-interpolate.lo libguppidataimpl/guppi-curve-poly.lo libguppidataimpl/guppi-data-table-core.lo libguppidataimpl/guppi-date-series-calc.lo libguppidataimpl/guppi-date-series-core.lo libguppidataimpl/guppi-price-series-core.lo libguppidataimpl/guppi-seq-boolean-core.lo libguppidataimpl/guppi-seq-date-core.lo libguppidataimpl/guppi-seq-integer-core.lo libguppidataimpl/guppi-seq-scalar-calc.lo libguppidataimpl/guppi-seq-scalar-core.lo libguppidataimpl/guppi-seq-scalar-func.lo libguppidataimpl/guppi-seq-string-core.lo libguppidataimpl/guppi-struct-core.lo libguppidataui/guppi-data-popup.lo libguppidataui/guppi-data-select.lo libguppidataui/guppi-data-tree-view.lo libguppidataui/guppi-data-ui-init.lo libguppistat/guppi-regression-linear.lo libguppistat/guppi-regression-polynomial.lo libguppistat/guppi-regression2d.lo libguppistat/guppi-simple-linreg.lo libguppistat/guppi-stat-init.lo libguppiplot/guppi-alpha-template.lo libguppiplot/guppi-axis-markers.lo libguppiplot/guppi-basic-tools.lo libguppiplot/guppi-canvas-group.lo libguppiplot/guppi-canvas-item.lo libguppiplot/guppi-color-palette.lo libguppiplot/guppi-config-dialog.lo libguppiplot/guppi-element-print.lo libguppiplot/guppi-element-state.lo libguppiplot/guppi-element-view.lo libguppiplot/guppi-geometry.lo libguppiplot/guppi-group-state.lo libguppiplot/guppi-group-view-layout.lo libguppiplot/guppi-group-view.lo libguppiplot/guppi-gsml.lo libguppiplot/guppi-layout-constraint.lo libguppiplot/guppi-layout-engine.lo libguppiplot/guppi-layout-rule-predef.lo libguppiplot/guppi-layout-rule.lo libguppiplot/guppi-marker.lo libguppiplot/guppi-pixbuf.lo libguppiplot/guppi-pixbuf-stock.lo libguppiplot/guppi-plot-init.lo libguppiplot/guppi-plot-plug-in.lo libguppiplot/guppi-plot-tool.lo libguppiplot/guppi-plot-toolhelp.lo libguppiplot/guppi-plot-toolkit.lo libguppiplot/guppi-raster-text.lo libguppiplot/guppi-root-group-item.lo libguppiplot/guppi-root-group-state.lo libguppiplot/guppi-root-group-tools.lo libguppiplot/guppi-root-group-view.lo libguppiplot/guppi-text-block.lo libguppiplot/guppi-text-tokens.lo libguppiplot/guppi-view-interval.lo
+libguppi_la_LDADD = -L$(libdir) -lxml -lgnomeui -lgnomeprint -lglade -lgtk
INCLUDES = -I$(top_builddir) -I$(includedir) -I$(top_srcdir) -I$(top_srcdir)/src/libguppiuseful -I$(top_srcdir)/src/libguppidata -I$(top_srcdir)/src/libguppidataimpl -I$(top_srcdir)/src/libguppidataui -I$(top_srcdir)/src/libguppispecfns -I$(top_srcdir)/src/libguppimath -I$(top_srcdir)/src/libguppistat -I$(top_srcdir)/src/libguppiplot -I$(top_builddir)/src/libguppiplot $(STANDARD_CFLAGS)
@@ -411,7 +412,7 @@
maintainer-clean-libtool:
libguppi.la: $(libguppi_la_OBJECTS) $(libguppi_la_DEPENDENCIES)
- $(LINK) -rpath $(libdir) $(libguppi_la_LDFLAGS) $(libguppi_la_OBJECTS) $(libguppi_la_LIBADD) $(LIBS)
+ $(LINK) -rpath $(libdir) $(libguppi_la_LDFLAGS) $(libguppi_la_OBJECTS) $(libguppi_la_LIBADD) $(LIBS) $(libguppi_la_LDADD)
mostlyclean-noinstPROGRAMS: