[fityk] 19/45: Imported Debian patch 0.8.5-1
Stuart Prescott
stuart at debian.org
Sun Nov 6 23:35:30 UTC 2016
This is an automated email from the git hooks/post-receive script.
stuart pushed a commit to branch master
in repository fityk.
commit 9428e924cb8ee1ad53ab2f83eae8ba7fc79e7d79
Merge: 478f8f3 8fe9567
Author: Carlo Segre <segre at debian.org>
Date: Sun Mar 30 11:31:03 2008 -0500
Imported Debian patch 0.8.5-1
3rdparty/Makefile.am | 3 +-
3rdparty/Makefile.in | 297 +-
3rdparty/README | 6 +-
3rdparty/boost/config/no_tr1/complex.hpp | 28 +
3rdparty/boost/config/no_tr1/functional.hpp | 28 +
3rdparty/boost/config/no_tr1/memory.hpp | 28 +
3rdparty/boost/config/no_tr1/utility.hpp | 28 +
3rdparty/boost/cstdint.hpp | 447 ++
3rdparty/boost/detail/endian.hpp | 73 +
3rdparty/xylib/COPYING | 504 ++
3rdparty/xylib/Makefile.am | 13 +
{doc => 3rdparty/xylib}/Makefile.in | 340 +-
3rdparty/xylib/README | 119 +
3rdparty/xylib/TODO | 8 +
3rdparty/xylib/config.guess | 1516 ++++++
3rdparty/xylib/config.sub | 1622 +++++++
3rdparty/xylib/depcomp | 584 +++
3rdparty/xylib/install-sh | 507 ++
3rdparty/xylib/ltmain.sh | 6938 +++++++++++++++++++++++++++
3rdparty/xylib/missing | 367 ++
3rdparty/xylib/web.css | 58 +
3rdparty/xylib/xyconv.cpp | 182 +
3rdparty/xylib/xylib/Makefile.am | 24 +
3rdparty/xylib/xylib/Makefile.in | 701 +++
3rdparty/xylib/xylib/brucker_raw.cpp | 146 +
3rdparty/xylib/xylib/brucker_raw.h | 28 +
3rdparty/xylib/xylib/canberra_mca.cpp | 113 +
3rdparty/xylib/xylib/canberra_mca.h | 31 +
3rdparty/xylib/xylib/cpi.cpp | 79 +
3rdparty/xylib/xylib/cpi.h | 21 +
3rdparty/xylib/xylib/dbws.cpp | 80 +
3rdparty/xylib/xylib/dbws.h | 34 +
3rdparty/xylib/xylib/gsas.cpp | 61 +
3rdparty/xylib/xylib/gsas.h | 23 +
3rdparty/xylib/xylib/pdcif.cpp | 529 ++
3rdparty/xylib/xylib/pdcif.h | 32 +
3rdparty/xylib/xylib/philips_raw.cpp | 91 +
3rdparty/xylib/xylib/philips_raw.h | 23 +
3rdparty/xylib/xylib/philips_udf.cpp | 109 +
3rdparty/xylib/xylib/philips_udf.h | 21 +
3rdparty/xylib/xylib/riet7.cpp | 45 +
3rdparty/xylib/xylib/riet7.h | 27 +
3rdparty/xylib/xylib/rigaku_dat.cpp | 124 +
3rdparty/xylib/xylib/rigaku_dat.h | 22 +
3rdparty/xylib/xylib/text.cpp | 122 +
3rdparty/xylib/xylib/text.h | 31 +
3rdparty/xylib/xylib/util.cpp | 355 ++
3rdparty/xylib/xylib/util.h | 146 +
3rdparty/xylib/xylib/uxd.cpp | 110 +
3rdparty/xylib/xylib/uxd.h | 21 +
3rdparty/xylib/xylib/vamas.cpp | 378 ++
3rdparty/xylib/xylib/vamas.h | 39 +
3rdparty/xylib/xylib/winspec_spe.cpp | 186 +
3rdparty/xylib/xylib/winspec_spe.h | 33 +
3rdparty/xylib/xylib/xfit_xdd.cpp | 64 +
3rdparty/xylib/xylib/xfit_xdd.h | 20 +
3rdparty/xylib/xylib/xylib.cpp | 306 ++
3rdparty/xylib/xylib/xylib.h | 260 +
INSTALL | 6 +-
Makefile.am | 4 +-
Makefile.in | 145 +-
NEWS | 35 +-
TODO | 146 +-
aclocal.m4 | 697 ++-
config/Makefile.in | 85 +-
configure | 1313 +++--
configure.ac | 25 +-
debian/changelog | 10 +-
debian/control | 2 +-
debian/rules | 2 +-
debian/watch | 4 +
doc/Makefile.am | 12 +-
doc/Makefile.in | 140 +-
doc/fitykhelp.htb | Bin 135002 -> 0 bytes
doc/fitykhelp.html | 210 +-
doc/fitykhelp.xml | 230 +-
doc/fitykhelp_img/Makefile.am | 6 +-
doc/fitykhelp_img/Makefile.in | 130 +-
fityk.desktop | 14 +-
fityk.iss | 6 +-
fityk.spec | 2 +-
macosx/macosx/.svn/entries | 2 +-
python/.deps/_fityk_la-fityk_wrap.Plo | 1 -
python/Makefile | 157 +-
python/Makefile.in | 131 +-
python/fityk.i | 34 +-
python/fityk.py | 4 +
python/fityk_wrap.cpp | 41 +-
samples/Makefile.in | 85 +-
samples/test_lib.py | 5 +-
samples/test_syntax.fit | 36 +-
src/Makefile.am | 15 +-
src/Makefile.in | 393 +-
src/ast.cpp | 61 +-
src/ast.h | 7 +-
src/calc.cpp | 11 +-
src/cli/Makefile.am | 2 +-
src/cli/Makefile.in | 128 +-
src/cli/gnuplot.cpp | 7 +-
src/cli/main.cpp | 63 +-
src/cmd.cpp | 35 +-
src/cmd2.cpp | 359 +-
src/cmd2.h | 54 +-
src/cmd3.cpp | 19 +-
src/cmd3.h | 4 +-
src/data.cpp | 514 +-
src/data.h | 45 +-
src/datatrans.cpp | 457 +-
src/datatrans.h | 6 +-
src/datatrans2.h | 8 +-
src/datatrans4.cpp | 5 +-
src/fileroutines.cpp | 240 -
src/fileroutines.h | 23 -
src/fit.cpp | 26 +-
src/fit.h | 9 +-
src/fityk.h | 20 +-
src/func.cpp | 23 +-
src/guess.cpp | 292 +-
src/guess.h | 47 +-
src/logic.cpp | 277 +-
src/logic.h | 59 +-
src/mgr.cpp | 4 +-
src/sum.cpp | 6 +-
src/sum.h | 4 +-
src/ui.cpp | 9 +-
src/ui.h | 7 +-
src/var.cpp | 5 +-
src/view.cpp | 202 +
src/view.h | 72 +
src/wxgui/Makefile.am | 24 +-
src/wxgui/Makefile.in | 193 +-
src/wxgui/aplot.cpp | 62 +-
src/wxgui/aplot.h | 7 +-
src/wxgui/app.cpp | 89 +-
src/wxgui/app.h | 4 +-
src/wxgui/cmn.cpp | 17 +-
src/wxgui/cmn.h | 8 +-
src/wxgui/dataedit.cpp | 46 +-
src/wxgui/dataedit.h | 3 +-
src/wxgui/defmgr.cpp | 9 +-
src/wxgui/dialogs.cpp | 184 +-
src/wxgui/dialogs.h | 14 +-
src/wxgui/dload.cpp | 315 +-
src/wxgui/dload.h | 9 +-
src/wxgui/{gui.cpp => frame.cpp} | 298 +-
src/wxgui/{gui.h => frame.h} | 31 +-
src/wxgui/img/Makefile.am | 12 +-
src/wxgui/img/Makefile.in | 97 +-
src/wxgui/img/active_mode.xpm | 2 +-
src/wxgui/img/add.xpm | 2 +-
src/wxgui/img/add_peak.xpm | 2 +-
src/wxgui/img/addpeak_mode.xpm | 2 +-
src/wxgui/img/bg_mode.xpm | 2 +-
src/wxgui/img/bug16.h | 75 +
src/wxgui/img/close.xpm | 2 +-
src/wxgui/img/color.xpm | 2 +-
src/wxgui/img/colorsel.xpm | 2 +-
src/wxgui/img/cont_fit.xpm | 2 +-
src/wxgui/img/convert.xpm | 2 +-
src/wxgui/img/copyfunc.xpm | 2 +-
src/wxgui/img/down_arrow.xpm | 2 +-
src/wxgui/img/dpsize.xpm | 2 +-
src/wxgui/img/edit_data.xpm | 2 +-
src/wxgui/img/editf.xpm | 2 +-
src/wxgui/img/exec_down.xpm | 2 +-
src/wxgui/img/exec_selected.xpm | 2 +-
src/wxgui/img/filter.xpm | 2 +-
src/wxgui/img/fityk.xpm | 2 +-
src/wxgui/img/image16.h | 47 +
src/wxgui/img/lock.xpm | 2 +-
src/wxgui/img/lock_open.xpm | 2 +-
src/wxgui/img/manual.xpm | 2 +-
src/wxgui/img/mouse_l.xpm | 2 +-
src/wxgui/img/mouse_r.xpm | 2 +-
src/wxgui/img/open.xpm | 2 +-
src/wxgui/img/open_data.xpm | 2 +-
src/wxgui/img/open_data_custom.xpm | 2 +-
src/wxgui/img/rename.xpm | 2 +-
src/wxgui/img/revert16.h | 64 +
src/wxgui/img/right_pane.xpm | 2 +-
src/wxgui/img/run_fit.xpm | 2 +-
src/wxgui/img/run_script.xpm | 2 +-
src/wxgui/img/save.xpm | 2 +-
src/wxgui/img/save_as.xpm | 2 +-
src/wxgui/img/save_data.xpm | 2 +-
src/wxgui/img/save_script.xpm | 2 +-
src/wxgui/img/shiftup.xpm | 2 +-
src/wxgui/img/strip_bg.xpm | 2 +-
src/wxgui/img/sum.xpm | 2 +-
src/wxgui/img/undo_fit.xpm | 2 +-
src/wxgui/img/unused.xpm | 2 +-
src/wxgui/img/up_arrow.xpm | 2 +-
src/wxgui/img/xyconvert.ico | Bin 0 -> 9974 bytes
src/wxgui/img/xyconvert16.xpm | 27 +
src/wxgui/img/xyconvert48.xpm | 105 +
src/wxgui/img/zoom-fit16.h | 43 +
src/wxgui/img/zoom_all.xpm | 2 +-
src/wxgui/img/zoom_left.xpm | 2 +-
src/wxgui/img/zoom_mode.xpm | 2 +-
src/wxgui/img/zoom_prev.xpm | 2 +-
src/wxgui/img/zoom_right.xpm | 2 +-
src/wxgui/img/zoom_up.xpm | 2 +-
src/wxgui/img/zoom_vert.xpm | 2 +-
src/wxgui/img/zshift.xpm | 2 +-
src/wxgui/inputline.cpp | 53 +-
src/wxgui/inputline.h | 10 +-
src/wxgui/listptxt.cpp | 34 +-
src/wxgui/listptxt.h | 4 +-
src/wxgui/mplot.cpp | 186 +-
src/wxgui/mplot.h | 24 +-
src/wxgui/pane.cpp | 11 +-
src/wxgui/plot.cpp | 188 +-
src/wxgui/plot.h | 96 +-
src/wxgui/print.cpp | 102 +-
src/wxgui/print.h | 13 +-
src/wxgui/sdebug.cpp | 4 +-
src/wxgui/setdlg.cpp | 9 +-
src/wxgui/sidebar.cpp | 224 +-
src/wxgui/sidebar.h | 16 +-
src/wxgui/uplot.cpp | 138 +
src/wxgui/uplot.h | 48 +
src/wxgui/xybrowser.cpp | 784 +++
src/wxgui/xyconvert.rc | 7 +
223 files changed, 24444 insertions(+), 4757 deletions(-)
diff --cc debian/changelog
index 9c24d21,0000000..a5e4094
mode 100644,000000..100644
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,141 -1,0 +1,149 @@@
++fityk (0.8.5-1) unstable; urgency=low
++
++ * New upstream release
++ * Reenable 3rdparty usage in build (this means using the included Boost
++ libraries and removing the Build-Depends on them).
++
++ -- Carlo Segre <segre at debian.org> Sun, 30 Mar 2008 11:31:03 -0500
++
+fityk (0.8.2-2) unstable; urgency=low
+
- * Accepted patches from NMU (Closes: #455180)
++ * Acknowledge NMU (Closes: #455180)
+ * Upgrade to Standards-Version 3.7.3 (no changes)
+ * Move Homepage from description to debian/control header
+
+ -- Carlo Segre <segre at debian.org> Sat, 22 Mar 2008 11:29:16 -0500
+
+fityk (0.8.2-1.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Fix gcc-4.3 FTBFS, patch by Cyril Brulebois
+ <cyril.brulebois at enst-bretagne.fr>. (Closes: #455180)
+
+ -- Marc 'HE' Brockschmidt <he at debian.org> Sun, 16 Mar 2008 17:26:13 +0100
+
+fityk (0.8.2-1) unstable; urgency=low
+
+ * New upstream release
+ * Restored optimization
+ * Use static libraries for now
+ * Don't compile python wrapper yet
+
+ -- Carlo Segre <segre at debian.org> Thu, 23 Aug 2007 00:20:21 -0500
+
+fityk (0.7.8-2) unstable; urgency=low
+
+ * Added declarations to src/numfuncs.h to allow compilation
+ by g++4.3 (Closes: #417192)
+ * Don't ignore clean errors
+ * Compatibility level 5
+ * Comply with menu and desktop policy
+
+ -- Carlo Segre <segre at debian.org> Sat, 18 Aug 2007 11:08:05 -0500
+
+fityk (0.7.8-1) unstable; urgency=low
+
+ * New upstream release
+ * Restored -O2 compiler flags - upstream has fixed g++-4.1 compile
+
+ -- Carlo Segre <segre at debian.org> Wed, 7 Mar 2007 18:58:33 -0600
+
+fityk (0.7.7-1) unstable; urgency=low
+
+ * New upstream release
+
+ -- Carlo Segre <segre at debian.org> Thu, 15 Feb 2007 23:46:35 -0600
+
+fityk (0.7.6-1) unstable; urgency=low
+
+ * New upstream release
+ * Force -O1 optimization for successful compilation with g++-4.1
+
+ -- Carlo Segre <segre at debian.org> Sat, 16 Sep 2006 08:32:03 -0500
+
+fityk (0.7.5-3) unstable; urgency=low
+
+ * Added Tag: field in control, experiment for Enrico Zini
+
+ -- Carlo Segre <segre at debian.org> Sat, 9 Sep 2006 00:10:06 -0500
+
+fityk (0.7.5-2) unstable; urgency=low
+
+ * Relaxed build dependency on libwxgtk2.6.
+ * Changed maintainer email to segre at debian.org
+
+ -- Carlo Segre <segre at debian.org> Wed, 2 Aug 2006 16:44:31 -0500
+
+fityk (0.7.5-1) unstable; urgency=low
+
+ * New upstream release, see /usr/share/doc/fityk/changelog.gz.
+
+ -- Carlo Segre <segre at debian.org> Wed, 2 Aug 2006 13:30:07 -0500
+
+fityk (0.7.4-2) unstable; urgency=low
+
+ * Use .desktop file from upstream instead but leave the Ubuntu-
+ contributed version as an option.
+
+ -- Carlo Segre <segre at iit.edu> Wed, 7 Jun 2006 10:27:10 -0500
+
+fityk (0.7.4-1) unstable; urgency=low
+
+ * New upstream release
+ * Changed to Standards Version 3.7.2
+ * Added .desktop file from Phil Bull via Ubuntu maintainer
+ Emmet Hikory <emmet.hikory at gmail.com> (Thanks!)
+
+ -- Carlo Segre <segre at iit.edu> Tue, 6 Jun 2006 09:49:14 -0500
+
+fityk (0.7.3-1) unstable; urgency=low
+
+ * New upstream release (Closes: #360795)
+
+ -- Carlo Segre <segre at iit.edu> Tue, 11 Apr 2006 22:02:48 -0500
+
+fityk (0.7.2-1) unstable; urgency=low
+
+ * New upstream release
+ * Transition to WxWidgets 2.6 (Build-Dep on libwxgtk2.6-dev)
+ * Stop using local boost headers for compilation
+
+ -- Carlo Segre <segre at iit.edu> Sun, 12 Mar 2006 00:44:52 -0600
+
+fityk (0.5.1-2) unstable; urgency=low
+
+ * Changed build dep to libreadline5-dev (Closes: #326366).
+
+ -- Carlo Segre <segre at iit.edu> Sat, 3 Sep 2005 13:05:05 -0500
+
+fityk (0.5.1-1) unstable; urgency=low
+
+ * New upstream release.
+ * Transition to g++ 4.0 (Closes: #316564).
+ * Added libboost-dev dependency and inhibit use of local version.
+
+ -- Carlo Segre <segre at iit.edu> Fri, 22 Jul 2005 07:24:17 -0500
+
+fityk (0.5.0p1-1) unstable; urgency=low
+
+ * New upstream release
+
+ -- Carlo Segre <segre at iit.edu> Sun, 12 Jun 2005 00:00:31 -0500
+
+fityk (0.4.4-1) unstable; urgency=low
+
+ * New upstream release. Changes described in NEWS.
+
+ -- Carlo Segre <segre at iit.edu> Tue, 8 Mar 2005 08:37:13 -0600
+
+fityk (0.4.3p1-1) unstable; urgency=low
+
+ * New upstream release. Changes described in NEWS.
+
+ -- Carlo Segre <segre at iit.edu> Sat, 20 Nov 2004 12:11:22 -0600
+
+fityk (0.4.2-1) unstable; urgency=low
+
+ * Initial Release (Closes: #271166).
+
+ -- Carlo Segre <segre at iit.edu> Fri, 10 Sep 2004 11:23:40 -0500
diff --cc debian/control
index e36b96c,0000000..ed8be72
mode 100644,000000..100644
--- a/debian/control
+++ b/debian/control
@@@ -1,30 -1,0 +1,30 @@@
+Source: fityk
+Section: science
+Priority: optional
+Maintainer: Carlo Segre <segre at debian.org>
- Build-Depends: debhelper (>> 5.0.0), libwxgtk2.6-dev (>> 2.6.0), libboost-dev, libreadline5-dev
++Build-Depends: debhelper (>> 5.0.0), libwxgtk2.6-dev (>> 2.6.0), libreadline5-dev
+Homepage: http://www.unipress.waw.pl/fityk/
+Standards-Version: 3.7.3
+
+Package: fityk
+Architecture: any
+Tag: field::chemistry, field::physics, implemented-in::c++, interface::x11, role::program, scope::utility, uitoolkit::wxwidgets, x11::application
+Depends: ${shlibs:Depends}
+Recommends: gnuplot
+Suggests: menu
+Description: general-purpose nonlinear curve fitting and data analysis
+ Fityk is a flexible and portable program for nonlinear fitting of analytical
+ functions (especially peak-shaped) to data (usually experimental data). In
+ other words, for nonlinear peak separation and analysis.
+ .
+ It was developed for analyzing diffraction patterns, but can be also used in
+ other fields, since concepts and operations specific for crystallography are
+ separated from the rest of the program.
+ .
+ Fityk offers various nonlinear fitting methods, subtracting background,
+ calibrating data, easy placement of peaks and changing peak parameters,
+ automation of common tasks with scripts, and much more. The main advantage
+ of the program is flexibility - parameters of peaks can be arbitrarily
+ bound to each other, eg. the width of a peak can be an independent
+ variable, can be the same as the width of another peak or can be given
+ by a complicated - common to all peaks - formula.
diff --cc debian/rules
index 548b4aa,0000000..8b4ca5f
mode 100755,000000..100755
--- a/debian/rules
+++ b/debian/rules
@@@ -1,88 -1,0 +1,88 @@@
+#!/usr/bin/make -f
+
+DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
+DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+
+
+ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
+ CFLAGS += -O2 -g -Wall
+endif
+ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
+ INSTALL_PROGRAM += -s
+endif
+
+config.status: configure
+ dh_testdir
+ -test -r /usr/share/misc/config.sub && \
+ cp -f /usr/share/misc/config.sub config.sub
+ -test -r /usr/share/misc/config.guess && \
+ cp -f /usr/share/misc/config.guess config.guess
- ./configure --disable-3rdparty --disable-shared \
++ ./configure --disable-shared \
+ --enable-static --host=$(DEB_HOST_GNU_TYPE) \
+ --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr \
+ --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info
+
+
+build: build-stamp
+
+build-stamp: config.status
+ dh_testdir
+ $(MAKE)
+ touch build-stamp
+
+clean:
+ dh_testdir
+ dh_testroot
+ rm -f build-stamp
+ -rm -f config.sub config.guess
+ [ ! -f Makefile ] || $(MAKE) distclean
+
+
+ dh_clean
+
+install: build
+ dh_testdir
+ dh_testroot
+ dh_clean -k
+ dh_installdirs
+
+ # Add here commands to install the package into debian/fityk.
+ $(MAKE) install prefix=$(CURDIR)/debian/fityk/usr
+ mkdir -p $(CURDIR)/debian/fityk/usr/share/pixmaps
+ cp src/wxgui/img/fityk.xpm $(CURDIR)/debian/fityk/usr/share/pixmaps/
+ dh_install fityk.desktop usr/share/applications/
+ dh_desktop
+ cp samples/*.dat $(CURDIR)/debian/fityk/usr/share/doc/fityk/samples/
+ cp samples/*.fit $(CURDIR)/debian/fityk/usr/share/doc/fityk/samples/
+ cp samples/README $(CURDIR)/debian/fityk/usr/share/doc/fityk/samples/
+# Remove static libraries and headers for now
+ rm -rf $(CURDIR)/debian/fityk/usr/lib
+ rm -rf $(CURDIR)/debian/fityk/usr/include
+
+
+# Build architecture-independent files here.
+binary-indep: build install
+# We have nothing to do by default.
+
+# Build architecture-dependent files here.
+binary-arch: build install
+ dh_testdir
+ dh_testroot
+ dh_installdocs
+ dh_installexamples
+ dh_installmenu
+ dh_installman
+ dh_installinfo
+ dh_installchangelogs NEWS
+ dh_link
+ dh_strip
+ dh_compress --exclude=.dat --exclude=.fit
+ dh_fixperms
+ dh_installdeb
+ dh_shlibdeps
+ dh_gencontrol
+ dh_md5sums
+ dh_builddeb
+
+binary: binary-indep binary-arch
+.PHONY: build clean binary-indep binary-arch binary install
diff --cc debian/watch
index d115595,0000000..03f4abc
mode 100644,000000..100644
--- a/debian/watch
+++ b/debian/watch
@@@ -1,3 -1,0 +1,7 @@@
+version=3
++# qa.debian.org redirector timing out
++#http://sf.net/fityk/fityk-(.+)\.tar\.bz2 debian uupdate
++#ftp://upload.sourceforge.net/pub/sourceforge/f/fi/fityk/ \
++# fityk-(.+)\.tar\.bz2 debian uupdate
+ftp://heanet.dl.sourceforge.net/f/fi/fityk/fityk-(.*)\.tar\.bz2 \
+ debian uupdate
diff --cc python/Makefile
index f5dc8c7,0000000..12c4eaa
mode 100644,000000..100644
--- a/python/Makefile
+++ b/python/Makefile
@@@ -1,557 -1,0 +1,566 @@@
- # Makefile.in generated by automake 1.9.6 from Makefile.am.
++# Makefile.in generated by automake 1.10 from Makefile.am.
+# python/Makefile. Generated from Makefile.in by configure.
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
- # 2003, 2004, 2005 Free Software Foundation, Inc.
++# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+
+
- srcdir = .
- top_srcdir = ..
+
+pkgdatadir = $(datadir)/fityk
+pkglibdir = $(libdir)/fityk
+pkgincludedir = $(includedir)/fityk
- top_builddir = ..
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
- INSTALL = /usr/bin/install -c
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = i486-pc-linux-gnu
+host_triplet = i486-pc-linux-gnu
+target_triplet = i486-pc-linux-gnu
+subdir = python
+DIST_COMMON = $(python_PYTHON) $(srcdir)/Makefile.am \
+ $(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/config/ac_pkg_swig.m4 \
+ $(top_srcdir)/config/ac_python_devel.m4 \
+ $(top_srcdir)/config/readline.m4 $(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+mkinstalldirs = $(install_sh) -d
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+ *) f=$$p;; \
+ esac;
+am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+am__installdirs = "$(DESTDIR)$(pyexecdir)" "$(DESTDIR)$(pythondir)"
+pyexecLTLIBRARIES_INSTALL = $(INSTALL)
+LTLIBRARIES = $(pyexec_LTLIBRARIES)
+_fityk_la_DEPENDENCIES = ../src/libfityk.la
+am__objects_1 =
+am__fityk_la_OBJECTS = _fityk_la-fityk_wrap.lo $(am__objects_1)
+_fityk_la_OBJECTS = $(am__fityk_la_OBJECTS)
- DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
++_fityk_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
++ $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
++ $(CXXFLAGS) $(_fityk_la_LDFLAGS) $(LDFLAGS) -o $@
++DEFAULT_INCLUDES = -I. -I$(top_builddir)
+depcomp = $(SHELL) $(top_srcdir)/config/depcomp
+am__depfiles_maybe = depfiles
+CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS)
++LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++ --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
++ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+CXXLD = $(CXX)
- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++ --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
++ $(LDFLAGS) -o $@
+SOURCES = $(_fityk_la_SOURCES)
+DIST_SOURCES = $(_fityk_la_SOURCES)
+pythonPYTHON_INSTALL = $(INSTALL_DATA)
+py_compile = $(top_srcdir)/config/py-compile
+ETAGS = etags
+CTAGS = ctags
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
- ACLOCAL = ${SHELL} /home/debian/fityk/nmu/fityk-0.8.2/config/missing --run aclocal-1.9
- AMDEP_FALSE = #
- AMDEP_TRUE =
- AMTAR = ${SHELL} /home/debian/fityk/nmu/fityk-0.8.2/config/missing --run tar
++ACLOCAL = ${SHELL} /home/debian/fityk/fityk-0.8.5/config/missing --run aclocal-1.10
++AMTAR = ${SHELL} /home/debian/fityk/fityk-0.8.5/config/missing --run tar
+AR = ar
- AUTOCONF = ${SHELL} /home/debian/fityk/nmu/fityk-0.8.2/config/missing --run autoconf
- AUTOHEADER = ${SHELL} /home/debian/fityk/nmu/fityk-0.8.2/config/missing --run autoheader
- AUTOMAKE = ${SHELL} /home/debian/fityk/nmu/fityk-0.8.2/config/missing --run automake-1.9
++AUTOCONF = ${SHELL} /home/debian/fityk/fityk-0.8.5/config/missing --run autoconf
++AUTOHEADER = ${SHELL} /home/debian/fityk/fityk-0.8.5/config/missing --run autoheader
++AUTOMAKE = ${SHELL} /home/debian/fityk/fityk-0.8.5/config/missing --run automake-1.10
+AWK = gawk
+CC = i486-linux-gnu-gcc
+CCDEPMODE = depmode=gcc3
+CFLAGS = -g -O2
+CPP = i486-linux-gnu-gcc -E
+CPPFLAGS =
- CPPFLAGS_3RDPARTY =
++CPPFLAGS_3RDPARTY = -I$(top_srcdir)/3rdparty -I$(top_srcdir)/3rdparty/xylib
+CXX = i486-linux-gnu-g++
+CXXCPP = i486-linux-gnu-g++ -E
+CXXDEPMODE = depmode=gcc3
+CXXFLAGS = -g -O2
+CYGPATH_W = echo
+DEFS = -DHAVE_CONFIG_H
+DEPDIR = .deps
+DOC = doc
+ECHO = echo
+ECHO_C =
+ECHO_N = -n
+ECHO_T =
+EGREP = /bin/grep -E
+EXEEXT =
+F77 = i486-linux-gnu-g77
+FFLAGS = -g -O2
+GREP = /bin/grep
++INSTALL = /usr/bin/install -c
+INSTALL_DATA = ${INSTALL} -m 644
+INSTALL_PROGRAM = ${INSTALL}
+INSTALL_SCRIPT = ${INSTALL}
- INSTALL_STRIP_PROGRAM = ${SHELL} $(install_sh) -c -s
++INSTALL_STRIP_PROGRAM = $(install_sh) -c -s
+LDFLAGS =
+LIBOBJS =
+LIBRARY_VERSION_FLAG = -version-info 0:0:0
+LIBS = -lm -lm
+LIBTOOL = $(SHELL) $(top_builddir)/libtool
+LN_S = ln -s
+LTLIBOBJS =
+MAINT = #
- MAINTAINER_MODE_FALSE =
- MAINTAINER_MODE_TRUE = #
- MAKEINFO = ${SHELL} /home/debian/fityk/nmu/fityk-0.8.2/config/missing --run makeinfo
++MAKEINFO = ${SHELL} /home/debian/fityk/fityk-0.8.5/config/missing --run makeinfo
++MKDIR_P = /bin/mkdir -p
+NO_READLINE =
+OBJEXT = o
- OS_WIN32_FALSE =
- OS_WIN32_TRUE = #
+PACKAGE = fityk
+PACKAGE_BUGREPORT =
+PACKAGE_NAME = fityk
- PACKAGE_STRING = fityk 0.8.2
++PACKAGE_STRING = fityk 0.8.5
+PACKAGE_TARNAME = fityk
- PACKAGE_VERSION = 0.8.2
++PACKAGE_VERSION = 0.8.5
+PATH_SEPARATOR = :
+PYBINDINGDIR =
+PYTHON =
+PYTHON_CPPFLAGS =
+PYTHON_EXEC_PREFIX =
+PYTHON_EXTRA_LDFLAGS =
+PYTHON_EXTRA_LIBS =
+PYTHON_LDFLAGS =
+PYTHON_PLATFORM =
+PYTHON_PREFIX =
+PYTHON_SITE_PKG =
+PYTHON_VERSION =
+RANLIB = ranlib
+RC =
+READLINE_LIBS = -lreadline -lncurses
++SED = /bin/sed
+SET_MAKE =
+SHELL = /bin/sh
+SRCSUBDIRS = wxgui cli
+STRIP = strip
+SWIG =
+SWIG_LIB =
+SWIG_PYTHON_CPPFLAGS =
+SWIG_PYTHON_OPT =
- VERSION = 0.8.2
++VERSION = 0.8.5
+WX_CFLAGS = -I/usr/lib/wx/include/gtk2-unicode-release-2.6 -I/usr/include/wx-2.6 -DGTK_NO_CHECK_CASTS -D__WXGTK__ -D_FILE_OFFSET_BITS=64 -D_LARGE_FILES -DNO_GCC_PRAGMA
+WX_CFLAGS_ONLY =
+WX_CONFIG_PATH = /usr/bin/wx-config
+WX_CPPFLAGS = -I/usr/lib/wx/include/gtk2-unicode-release-2.6 -I/usr/include/wx-2.6 -DGTK_NO_CHECK_CASTS -D__WXGTK__ -D_FILE_OFFSET_BITS=64 -D_LARGE_FILES -DNO_GCC_PRAGMA
+WX_CXXFLAGS = -I/usr/lib/wx/include/gtk2-unicode-release-2.6 -I/usr/include/wx-2.6 -DGTK_NO_CHECK_CASTS -D__WXGTK__ -D_FILE_OFFSET_BITS=64 -D_LARGE_FILES -DNO_GCC_PRAGMA
+WX_CXXFLAGS_ONLY = -I/usr/lib/wx/include/gtk2-unicode-release-2.6 -I/usr/include/wx-2.6 -DGTK_NO_CHECK_CASTS -D__WXGTK__ -D_FILE_OFFSET_BITS=64 -D_LARGE_FILES -DNO_GCC_PRAGMA
+WX_LIBS = -pthread -lwx_gtk2u_xrc-2.6 -lwx_gtk2u_qa-2.6 -lwx_gtk2u_html-2.6 -lwx_gtk2u_adv-2.6 -lwx_gtk2u_core-2.6 -lwx_baseu_xml-2.6 -lwx_baseu_net-2.6 -lwx_baseu-2.6
+WX_LIBS_STATIC =
++WX_RESCOMP =
+WX_VERSION = 2.6.3
++XYLIB_LDADD = $(top_builddir)/3rdparty/xylib/xylib/libxy.la
++abs_builddir = /home/debian/fityk/fityk-0.8.5/python
++abs_srcdir = /home/debian/fityk/fityk-0.8.5/python
++abs_top_builddir = /home/debian/fityk/fityk-0.8.5
++abs_top_srcdir = /home/debian/fityk/fityk-0.8.5
+ac_ct_CC =
+ac_ct_CXX =
+ac_ct_F77 =
- am__fastdepCC_FALSE = #
- am__fastdepCC_TRUE =
- am__fastdepCXX_FALSE = #
- am__fastdepCXX_TRUE =
+am__include = include
+am__leading_dot = .
+am__quote =
+am__tar = ${AMTAR} chof - "$$tardir"
+am__untar = ${AMTAR} xf -
+bindir = ${exec_prefix}/bin
+build = i486-pc-linux-gnu
+build_alias = i486-linux-gnu
+build_cpu = i486
+build_os = linux-gnu
+build_vendor = pc
++builddir = .
+datadir = ${datarootdir}
+datarootdir = ${prefix}/share
+docdir = ${datarootdir}/doc/${PACKAGE_TARNAME}
+dvidir = ${docdir}
+exec_prefix = ${prefix}
+gnuplot_in_path = yes
+host = i486-pc-linux-gnu
+host_alias = i486-linux-gnu
+host_cpu = i486
+host_os = linux-gnu
+host_vendor = pc
+htmldir = ${docdir}
+includedir = ${prefix}/include
+infodir = ${prefix}/share/info
- install_sh = /home/debian/fityk/nmu/fityk-0.8.2/config/install-sh
++install_sh = $(SHELL) /home/debian/fityk/fityk-0.8.5/config/install-sh
+libdir = ${exec_prefix}/lib
+libexecdir = ${exec_prefix}/libexec
+localedir = ${datarootdir}/locale
+localstatedir = ${prefix}/var
+mandir = ${prefix}/share/man
- mkdir_p = mkdir -p --
++mkdir_p = /bin/mkdir -p
+oldincludedir = /usr/include
+pdfdir = ${docdir}
+pkgpyexecdir =
+pkgpythondir =
+prefix = /usr
+program_transform_name = s,x,x,
+psdir = ${docdir}
+pyexecdir =
+pythondir =
+sbindir = ${exec_prefix}/sbin
+sharedstatedir = ${prefix}/com
++srcdir = .
+sysconfdir = ${prefix}/etc
+target = i486-pc-linux-gnu
+target_alias =
+target_cpu = i486
+target_os = linux-gnu
+target_vendor = pc
++top_builddir = ..
++top_srcdir = ..
+
+# $Id: Makefile.am 238 2007-01-21 01:44:04Z wojdyr $
+EXTRA_DIST =
+BUILT_SOURCES = $(srcdir)/fityk_wrap.cpp
+SWIG_SOURCES = fityk.i
+python_PYTHON = fityk.py
+pyexec_LTLIBRARIES = _fityk.la
+_fityk_la_SOURCES = $(srcdir)/fityk_wrap.cpp $(SWIG_SOURCES)
+_fityk_la_CPPFLAGS = $(SWIG_PYTHON_CPPFLAGS) -I$(top_srcdir)/src
+_fityk_la_LDFLAGS = -version-info 0:0:0 -module
+_fityk_la_LIBADD = ../src/libfityk.la
+all: $(BUILT_SOURCES)
+ $(MAKE) $(AM_MAKEFLAGS) all-am
+
+.SUFFIXES:
+.SUFFIXES: .cpp .lo .o .obj
+$(srcdir)/Makefile.in: # $(srcdir)/Makefile.am $(am__configure_deps)
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+ && exit 0; \
+ exit 1;; \
+ esac; \
+ done; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign python/Makefile'; \
+ cd $(top_srcdir) && \
+ $(AUTOMAKE) --foreign python/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+ @case '$?' in \
+ *config.status*) \
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+ *) \
+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+ esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: # $(am__configure_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): # $(am__aclocal_m4_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+install-pyexecLTLIBRARIES: $(pyexec_LTLIBRARIES)
+ @$(NORMAL_INSTALL)
- test -z "$(pyexecdir)" || $(mkdir_p) "$(DESTDIR)$(pyexecdir)"
++ test -z "$(pyexecdir)" || $(MKDIR_P) "$(DESTDIR)$(pyexecdir)"
+ @list='$(pyexec_LTLIBRARIES)'; for p in $$list; do \
+ if test -f $$p; then \
+ f=$(am__strip_dir) \
+ echo " $(LIBTOOL) --mode=install $(pyexecLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(pyexecdir)/$$f'"; \
+ $(LIBTOOL) --mode=install $(pyexecLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(pyexecdir)/$$f"; \
+ else :; fi; \
+ done
+
+uninstall-pyexecLTLIBRARIES:
+ @$(NORMAL_UNINSTALL)
- @set -x; list='$(pyexec_LTLIBRARIES)'; for p in $$list; do \
++ @list='$(pyexec_LTLIBRARIES)'; for p in $$list; do \
+ p=$(am__strip_dir) \
+ echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(pyexecdir)/$$p'"; \
+ $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(pyexecdir)/$$p"; \
+ done
+
+clean-pyexecLTLIBRARIES:
+ -test -z "$(pyexec_LTLIBRARIES)" || rm -f $(pyexec_LTLIBRARIES)
+ @list='$(pyexec_LTLIBRARIES)'; for p in $$list; do \
+ dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
+ test "$$dir" != "$$p" || dir=.; \
+ echo "rm -f \"$${dir}/so_locations\""; \
+ rm -f "$${dir}/so_locations"; \
+ done
+_fityk.la: $(_fityk_la_OBJECTS) $(_fityk_la_DEPENDENCIES)
- $(CXXLINK) -rpath $(pyexecdir) $(_fityk_la_LDFLAGS) $(_fityk_la_OBJECTS) $(_fityk_la_LIBADD) $(LIBS)
++ $(_fityk_la_LINK) -rpath $(pyexecdir) $(_fityk_la_OBJECTS) $(_fityk_la_LIBADD) $(LIBS)
+
+mostlyclean-compile:
+ -rm -f *.$(OBJEXT)
+
+distclean-compile:
+ -rm -f *.tab.c
+
+include ./$(DEPDIR)/_fityk_la-fityk_wrap.Plo
+
+.cpp.o:
- if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
- then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
++ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+# source='$<' object='$@' libtool=no \
+# DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) \
+# $(CXXCOMPILE) -c -o $@ $<
+
+.cpp.obj:
- if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
- then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
++ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+# source='$<' object='$@' libtool=no \
+# DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) \
+# $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+
+.cpp.lo:
- if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
- then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++ $(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
++ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+# source='$<' object='$@' libtool=yes \
+# DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) \
+# $(LTCXXCOMPILE) -c -o $@ $<
+
+_fityk_la-fityk_wrap.lo: $(srcdir)/fityk_wrap.cpp
- if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(_fityk_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT _fityk_la-fityk_wrap.lo -MD -MP -MF "$(DEPDIR)/_fityk_la-fityk_wrap.Tpo" -c -o _fityk_la-fityk_wrap.lo `test -f '$(srcdir)/fityk_wrap.cpp' || echo '$(srcdir)/'`$(srcdir)/fityk_wrap.cpp; \
- then mv -f "$(DEPDIR)/_fityk_la-fityk_wrap.Tpo" "$(DEPDIR)/_fityk_la-fityk_wrap.Plo"; else rm -f "$(DEPDIR)/_fityk_la-fityk_wrap.Tpo"; exit 1; fi
++ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(_fityk_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT _fityk_la-fityk_wrap.lo -MD -MP -MF $(DEPDIR)/_fityk_la-fityk_wrap.Tpo -c -o _fityk_la-fityk_wrap.lo `test -f '$(srcdir)/fityk_wrap.cpp' || echo '$(srcdir)/'`$(srcdir)/fityk_wrap.cpp
++ mv -f $(DEPDIR)/_fityk_la-fityk_wrap.Tpo $(DEPDIR)/_fityk_la-fityk_wrap.Plo
+# source='$(srcdir)/fityk_wrap.cpp' object='_fityk_la-fityk_wrap.lo' libtool=yes \
+# DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) \
- # $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(_fityk_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o _fityk_la-fityk_wrap.lo `test -f '$(srcdir)/fityk_wrap.cpp' || echo '$(srcdir)/'`$(srcdir)/fityk_wrap.cpp
++# $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(_fityk_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o _fityk_la-fityk_wrap.lo `test -f '$(srcdir)/fityk_wrap.cpp' || echo '$(srcdir)/'`$(srcdir)/fityk_wrap.cpp
+
+mostlyclean-libtool:
+ -rm -f *.lo
+
+clean-libtool:
+ -rm -rf .libs _libs
-
- distclean-libtool:
- -rm -f libtool
- uninstall-info-am:
+install-pythonPYTHON: $(python_PYTHON)
+ @$(NORMAL_INSTALL)
- test -z "$(pythondir)" || $(mkdir_p) "$(DESTDIR)$(pythondir)"
++ test -z "$(pythondir)" || $(MKDIR_P) "$(DESTDIR)$(pythondir)"
+ @list='$(python_PYTHON)'; dlist=''; for p in $$list; do\
+ if test -f "$$p"; then b=; else b="$(srcdir)/"; fi; \
+ if test -f $$b$$p; then \
+ f=$(am__strip_dir) \
+ dlist="$$dlist $$f"; \
+ echo " $(pythonPYTHON_INSTALL) '$$b$$p' '$(DESTDIR)$(pythondir)/$$f'"; \
+ $(pythonPYTHON_INSTALL) "$$b$$p" "$(DESTDIR)$(pythondir)/$$f"; \
+ else :; fi; \
+ done; \
+ if test -n "$$dlist"; then \
+ if test -z "$(DESTDIR)"; then \
+ PYTHON=$(PYTHON) $(py_compile) --basedir "$(pythondir)" $$dlist; \
+ else \
+ PYTHON=$(PYTHON) $(py_compile) --destdir "$(DESTDIR)" --basedir "$(pythondir)" $$dlist; \
+ fi; \
+ else :; fi
+
+uninstall-pythonPYTHON:
+ @$(NORMAL_UNINSTALL)
+ @list='$(python_PYTHON)'; dlist=''; for p in $$list; do\
+ f=$(am__strip_dir) \
+ rm -f "$(DESTDIR)$(pythondir)/$$f"; \
+ rm -f "$(DESTDIR)$(pythondir)/$${f}c"; \
+ rm -f "$(DESTDIR)$(pythondir)/$${f}o"; \
+ done
+
+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
+ mkid -fID $$unique
+tags: TAGS
+
+TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
+ $(TAGS_FILES) $(LISP)
+ tags=; \
+ here=`pwd`; \
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
+ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+ test -n "$$unique" || unique=$$empty_fix; \
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ $$tags $$unique; \
+ fi
+ctags: CTAGS
+CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
+ $(TAGS_FILES) $(LISP)
+ tags=; \
+ here=`pwd`; \
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
+ test -z "$(CTAGS_ARGS)$$tags$$unique" \
+ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+ $$tags $$unique
+
+GTAGS:
+ here=`$(am__cd) $(top_builddir) && pwd` \
+ && cd $(top_srcdir) \
+ && gtags -i $(GTAGS_ARGS) $$here
+
+distclean-tags:
+ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+distdir: $(DISTFILES)
- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
- list='$(DISTFILES)'; for file in $$list; do \
- case $$file in \
- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
- esac; \
++ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
++ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
++ list='$(DISTFILES)'; \
++ dist_files=`for file in $$list; do echo $$file; done | \
++ sed -e "s|^$$srcdirstrip/||;t" \
++ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
++ case $$dist_files in \
++ */*) $(MKDIR_P) `echo "$$dist_files" | \
++ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
++ sort -u` ;; \
++ esac; \
++ for file in $$dist_files; do \
+ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
- if test "$$dir" != "$$file" && test "$$dir" != "."; then \
- dir="/$$dir"; \
- $(mkdir_p) "$(distdir)$$dir"; \
- else \
- dir=''; \
- fi; \
+ if test -d $$d/$$file; then \
++ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ fi; \
+ cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+ else \
+ test -f $(distdir)/$$file \
+ || cp -p $$d/$$file $(distdir)/$$file \
+ || exit 1; \
+ fi; \
+ done
+check-am: all-am
+check: $(BUILT_SOURCES)
+ $(MAKE) $(AM_MAKEFLAGS) check-am
+all-am: Makefile $(LTLIBRARIES)
+installdirs:
+ for dir in "$(DESTDIR)$(pyexecdir)" "$(DESTDIR)$(pythondir)"; do \
- test -z "$$dir" || $(mkdir_p) "$$dir"; \
++ test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+ done
+install: $(BUILT_SOURCES)
+ $(MAKE) $(AM_MAKEFLAGS) install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+ @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ `test -z '$(STRIP)' || \
+ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+
+maintainer-clean-generic:
+ @echo "This command is intended for maintainers to use"
+ @echo "it deletes files that may require special tools to rebuild."
+ -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
+clean: clean-am
+
+clean-am: clean-generic clean-libtool clean-pyexecLTLIBRARIES \
+ mostlyclean-am
+
+distclean: distclean-am
+ -rm -rf ./$(DEPDIR)
+ -rm -f Makefile
+distclean-am: clean-am distclean-compile distclean-generic \
- distclean-libtool distclean-tags
++ distclean-tags
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+info: info-am
+
+info-am:
+
+install-data-am: install-pythonPYTHON
+
++install-dvi: install-dvi-am
++
+install-exec-am: install-pyexecLTLIBRARIES
+
++install-html: install-html-am
++
+install-info: install-info-am
+
+install-man:
+
++install-pdf: install-pdf-am
++
++install-ps: install-ps-am
++
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+ -rm -rf ./$(DEPDIR)
+ -rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-compile mostlyclean-generic \
+ mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
- uninstall-am: uninstall-info-am uninstall-pyexecLTLIBRARIES \
- uninstall-pythonPYTHON
++uninstall-am: uninstall-pyexecLTLIBRARIES uninstall-pythonPYTHON
++
++.MAKE: install-am install-strip
+
+.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
+ clean-libtool clean-pyexecLTLIBRARIES ctags distclean \
+ distclean-compile distclean-generic distclean-libtool \
+ distclean-tags distdir dvi dvi-am html html-am info info-am \
- install install-am install-data install-data-am install-exec \
- install-exec-am install-info install-info-am install-man \
++ install install-am install-data install-data-am install-dvi \
++ install-dvi-am install-exec install-exec-am install-html \
++ install-html-am install-info install-info-am install-man \
++ install-pdf install-pdf-am install-ps install-ps-am \
+ install-pyexecLTLIBRARIES install-pythonPYTHON install-strip \
+ installcheck installcheck-am installdirs maintainer-clean \
+ maintainer-clean-generic mostlyclean mostlyclean-compile \
+ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
- tags uninstall uninstall-am uninstall-info-am \
- uninstall-pyexecLTLIBRARIES uninstall-pythonPYTHON
++ tags uninstall uninstall-am uninstall-pyexecLTLIBRARIES \
++ uninstall-pythonPYTHON
+
+
+$(srcdir)/fityk_wrap.cpp : $(SWIG_SOURCES) $(top_srcdir)/src/fityk.h
+ $(SWIG) $(SWIG_PYTHON_OPT) -I$(top_srcdir)/src -o $@ $<
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff --cc src/cmd2.h
index c59e994,472c174..1bd3dc9
--- a/src/cmd2.h
+++ b/src/cmd2.h
@@@ -16,8 -16,8 +16,10 @@@
#include <boost/spirit/core.hpp>
#include <boost/spirit/actor/increment_actor.hpp>
+ #include "common.h"
+
+#include <climits>
+
using namespace boost::spirit;
class DataWithSum;
diff --cc src/ui.cpp
index 5ed3bf0,9eec449..bf8464b
--- a/src/ui.cpp
+++ b/src/ui.cpp
@@@ -1,15 -1,15 +1,16 @@@
// This file is part of fityk program. Copyright (C) Marcin Wojdyr
// Licence: GNU General Public License version 2
- // $Id: ui.cpp 322 2007-07-24 00:17:11Z wojdyr $
+ // $Id: ui.cpp 382 2008-01-23 21:37:02Z wojdyr $
- #include "common.h"
- #include "ui.h"
- #include "settings.h"
#include <string>
#include <iostream>
+ #include <string.h>
+
+ #include "ui.h"
+ #include "settings.h"
#include "logic.h"
#include "cmd.h"
+#include <cstring>
using namespace std;
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/fityk.git
More information about the debian-science-commits
mailing list