Permalink
Browse files

added math.h link

  • Loading branch information...
1 parent e825606 commit c4dd876b11e44c4a3f3dfa06be3afb621a99fba8 @pchilds committed Oct 25, 2012
Showing with 22 additions and 22 deletions.
  1. +2 −2 Makefile.am
  2. +10 −10 configure.ac
  3. +4 −4 gtk2plot/Makefile.am
  4. +6 −6 reversion.sh
View
@@ -1,8 +1,8 @@
## Process this file with automake to produce Makefile.in
-SUBDIRS=gtk3plot debian
+SUBDIRS=gtk2plot debian
ACLOCAL_AMFLAGS=-I m4 ${ACLOCAL_FLAGS}
MAINTAINERCLEANFILES=Makefile.in configure
DISTCLEANFILES= =
pkgconfigdir=$(libdir)/pkgconfig
-pkgconfig_DATA=gtkplot-3.0.pc
+pkgconfig_DATA=gtkplot-2.0.pc
View
@@ -1,26 +1,26 @@
AC_PREREQ([2.65])
-AC_INIT([Gtk3Plot],[3.0.0],[pchilds@physics.org],[gtk3plot],[https://github.com/pchilds/GtkPlot])
+AC_INIT([Gtk2Plot],[2.0.0],[pchilds@physics.org],[gtk2plot],[https://github.com/pchilds/GtkPlot])
AC_CONFIG_HEADERS([config.h gtkplotconfig.h])
-AC_CONFIG_SRCDIR([gtk3plot/gtkplotlinear.h])
+AC_CONFIG_SRCDIR([gtk2plot/gtkplotlinear.h])
AC_CONFIG_AUX_DIR([confsupp])
AC_CONFIG_MACRO_DIR([m4])
AM_INIT_AUTOMAKE([-Wall -Werror foreign])
AC_PROG_CC([gcc cc])
LT_PREREQ([2.2])
LT_INIT([win32-dll])
-AC_SUBST([PLOT_API_VERSION], [3.0])
-AC_SUBST([PLOT_GTK_MAJOR], [3])
-AC_SUBST([PLOT_GTK_MINOR], [2])
-AC_SUBST([PLOT_SDIR], [gtk3plot])
+AC_SUBST([PLOT_API_VERSION], [2.0])
+AC_SUBST([PLOT_GTK_MAJOR], [2])
+AC_SUBST([PLOT_GTK_MINOR], [18])
+AC_SUBST([PLOT_SDIR], [gtk2plot])
lt_enable_auto_import=
case "$host_os" in
mingw*)
lt_enable_auto_import="-Wl,--enable-auto-import"
esac
AC_SUBST([lt_enable_auto_import])
-PKG_CHECK_MODULES([PLOT], [gtk+-3.0 >= 3.2])
-AC_CONFIG_FILES([Makefile gtk3plot/Makefile \
- gtkplot-3.0.pc:gtkplot.pc.in \
- COPYING:COPYING-3.0.in])
+PKG_CHECK_MODULES([PLOT], [gtk+-2.0 >= 2.18])
+AC_CONFIG_FILES([Makefile gtk2plot/Makefile \
+ gtkplot-2.0.pc:gtkplot.pc.in \
+ COPYING:COPYING-2.0.in])
AC_CONFIG_FILES([debian/Makefile])
AC_OUTPUT()
View
@@ -12,8 +12,8 @@ libgtkplot_@PLOT_API_VERSION@_la_SOURCES= \
libgtkplot_@PLOT_API_VERSION@_la_LDFLAGS= \
@lt_enable_auto_import@ \
-no-undefined \
- -version-info 0:0:0 \
- $(PLOT_LIBS)
+ -version-info 0:0:0 \
+ $(PLOT_LIBS) -lm
gtkplotincludedir=$(includedir)/gtkplot-2.0
gtkplotinclude_HEADERS= \
gtkplot.h \
@@ -22,6 +22,6 @@ gtkplotinclude_HEADERS= \
bin_PROGRAMS=TestPlotLinear TestPlotPolar
TestPlotLinear_SOURCES=testplotlinear.c
-TestPlotLinear_LDADD=$(PLOT_LIBS) libgtkplot-@PLOT_API_VERSION@.la
+TestPlotLinear_LDADD=$(PLOT_LIBS) -lm libgtkplot-@PLOT_API_VERSION@.la
TestPlotPolar_SOURCES=testplotpolar.c
-TestPlotPolar_LDADD=$(PLOT_LIBS) libgtkplot-@PLOT_API_VERSION@.la
+TestPlotPolar_LDADD=$(PLOT_LIBS) -lm libgtkplot-@PLOT_API_VERSION@.la
View
@@ -34,7 +34,7 @@ then
echo " @lt_enable_auto_import@ \\"
echo " -no-undefined \\"
echo " -version-info ${lcr}:${lrv}:${lag} \\"
- echo " \$(PLOT_LIBS)"
+ echo " \$(PLOT_LIBS) -lm"
echo "gtkplotincludedir=\$(includedir)/gtkplot-3.${gar}"
echo "gtkplotinclude_HEADERS= \\"
echo " gtkplot.h \\"
@@ -46,9 +46,9 @@ then
echo ""
echo "bin_PROGRAMS=TestPlotLinear TestPlotPolar"
echo "TestPlotLinear_SOURCES=testplotlinear.c"
- echo "TestPlotLinear_LDADD=\$(PLOT_LIBS) libgtkplot-@PLOT_API_VERSION@.la"
+ echo "TestPlotLinear_LDADD=\$(PLOT_LIBS) -lm libgtkplot-@PLOT_API_VERSION@.la"
echo "TestPlotPolar_SOURCES=testplotpolar.c"
- echo "TestPlotPolar_LDADD=\$(PLOT_LIBS) libgtkplot-@PLOT_API_VERSION@.la"
+ echo "TestPlotPolar_LDADD=\$(PLOT_LIBS) -lm libgtkplot-@PLOT_API_VERSION@.la"
} >gtk3plot/Makefile.am
else
gmx=2
@@ -70,7 +70,7 @@ else
echo " @lt_enable_auto_import@ \\"
echo " -no-undefined \\"
echo " -version-info ${lcr}:${lrv}:${lag} \\"
- echo " \$(PLOT_LIBS)"
+ echo " \$(PLOT_LIBS) -lm"
echo "gtkplotincludedir=\$(includedir)/gtkplot-2.${gar}"
echo "gtkplotinclude_HEADERS= \\"
echo " gtkplot.h \\"
@@ -79,9 +79,9 @@ else
echo ""
echo "bin_PROGRAMS=TestPlotLinear TestPlotPolar"
echo "TestPlotLinear_SOURCES=testplotlinear.c"
- echo "TestPlotLinear_LDADD=\$(PLOT_LIBS) libgtkplot-@PLOT_API_VERSION@.la"
+ echo "TestPlotLinear_LDADD=\$(PLOT_LIBS) -lm libgtkplot-@PLOT_API_VERSION@.la"
echo "TestPlotPolar_SOURCES=testplotpolar.c"
- echo "TestPlotPolar_LDADD=\$(PLOT_LIBS) libgtkplot-@PLOT_API_VERSION@.la"
+ echo "TestPlotPolar_LDADD=\$(PLOT_LIBS) -lm libgtkplot-@PLOT_API_VERSION@.la"
} >gtk2plot/Makefile.am
fi
{

0 comments on commit c4dd876

Please sign in to comment.