Menu
▾
▴
[Plplot-cvs] SF.net SVN: plplot:[12123] trunk
|
From: <and...@us...> - 2012-01-05 13:59:47
|
Revision: 12123
http://plplot.svn.sourceforge.net/plplot/?rev=12123&view=rev
Author: andrewross
Date: 2012-01-05 13:59:36 +0000 (Thu, 05 Jan 2012)
Log Message:
-----------
Simplify the Makefile.examples support by removing all mentions of
plplot-config since it no longer exists.
Also remove pkg_config_true and pkg_config_false logic since this
serves no useful purpose now. Without pkg-config the Makefiles
won't work anyway. There is always the cmake alternative build
system.
Modified Paths:
--------------
trunk/cmake/modules/pkg-config.cmake
trunk/debian/rules
trunk/doc/docbook/src/deploying.xml
trunk/examples/c/Makefile.examples.in
trunk/examples/c++/Makefile.examples.in
trunk/examples/d/Makefile.examples.in
trunk/examples/f77/Makefile.examples.in
trunk/examples/f95/Makefile.examples.in
trunk/examples/ocaml/Makefile.examples.in
trunk/examples/tk/Makefile.examples.in
Modified: trunk/cmake/modules/pkg-config.cmake
===================================================================
--- trunk/cmake/modules/pkg-config.cmake 2012-01-05 13:00:11 UTC (rev 12122)
+++ trunk/cmake/modules/pkg-config.cmake 2012-01-05 13:59:36 UTC (rev 12123)
@@ -30,12 +30,6 @@
# PKG_CONFIG_EXECUTABLE - name of pkg-config executable, but can also be
# used for logical control with, e.g.,
# if(PKG_CONFIG_EXECUTABLE)
-# pkg_config_true - if null string, then example builds done with
-# pkg-config method. if "#" then that method is
-# commented out.
-# pkg_config_false - always "#" to comment out example builds with
-# plplot_config method which does not exist for
-# cmake build system.
# PKG_CONFIG_DIR - install location for configured PLplot
# pkg-config files.
# PKG_CONFIG_ENV - the string PKG_CONFIG_PATH=${PKG_CONFIG_DIR} which
@@ -43,20 +37,14 @@
include(FindPkgConfig)
-set(pkg_config_false "#")
-
if(PKG_CONFIG_EXECUTABLE)
message(STATUS "Looking for pkg-config - found")
- set(pkg_config_true "")
set(PKG_CONFIG_DIR ${LIB_DIR}/pkgconfig)
set(PKG_CONFIG_ENV PKG_CONFIG_PATH=${PKG_CONFIG_DIR})
else(PKG_CONFIG_EXECUTABLE)
message(STATUS "Looking for pkg-config - not found")
message(STATUS
- "WARNING: Makefile+pkg-config version of examples build in the install tree will be disabled.")
- # Turn off pkg-config build. (This means both build methods will be
- # commented out.)
- set(pkg_config_true "#")
+ "WARNING: Makefile+pkg-config version of examples build in the install tree will not work.")
endif(PKG_CONFIG_EXECUTABLE)
macro(pkg_check_pkgconfig _package _include_DIR _link_DIR _link_FLAGS _cflags _version)
Modified: trunk/debian/rules
===================================================================
--- trunk/debian/rules 2012-01-05 13:00:11 UTC (rev 12122)
+++ trunk/debian/rules 2012-01-05 13:59:36 UTC (rev 12123)
@@ -159,7 +159,6 @@
install --mode=644 examples/perl/x* examples/perl/README* \
$(debex)/perl
mv $(debex) $(debdoc)/$(libpkg)
- rm -f $(debtmp)/usr/bin/plplot-config
for i in libplplot-dev plplot-tcl plplot-tcl-dev \
plplot11-driver-gd plplot11-driver-xwin octave-plplot \
Modified: trunk/doc/docbook/src/deploying.xml
===================================================================
--- trunk/doc/docbook/src/deploying.xml 2012-01-05 13:00:11 UTC (rev 12122)
+++ trunk/doc/docbook/src/deploying.xml 2012-01-05 13:59:36 UTC (rev 12123)
@@ -91,7 +91,7 @@
url="http://plplot.sourceforge.net/resources/index.html">Resources
area</ulink> of the PLplot web site for locations of debs and rpms.)
Build the application on the build machine using the results of the
- <userinput>plplot-config --cflags --libs</userinput> command, and copy
+ <userinput>pkg-config --cflags --libs plplotd</userinput> command, and copy
the resulting executable(s) to the users' machines.
</para>
@@ -129,7 +129,7 @@
<listitem>
<para>
Build the application(s) on the build machine using the results
- of the <userinput>plplot-config --cflags --libs</userinput>
+ of the <userinput>pkg-config --cflags --libs plplotd</userinput>
command, and copy the resulting executable(s) to the users'
machines. Since the PLplot install location is consistent on all
machines, the application should work the same way on all
Modified: trunk/examples/c/Makefile.examples.in
===================================================================
--- trunk/examples/c/Makefile.examples.in 2012-01-05 13:00:11 UTC (rev 12122)
+++ trunk/examples/c/Makefile.examples.in 2012-01-05 13:59:36 UTC (rev 12123)
@@ -24,19 +24,19 @@
CC = @CC@
EXEEXT = @EXEEXT@
-@pkg_config_true@LIB_TAG = @LIB_TAG@
-@pkg_config_true@PKG_CONFIG_ENV = @PKG_CONFIG_ENV@
-@pkg_config_true@RPATHCMD = @RPATHCMD@
+LIB_TAG = @LIB_TAG@
+PKG_CONFIG_ENV = @PKG_CONFIG_ENV@
+RPATHCMD = @RPATHCMD@
@gcw_true@PLPLOTCANVAS_EXECUTABLES_list = \
@gcw_true@ plplotcanvas_demo$(EXEEXT) \
@gcw_true@ plplotcanvas_animation$(EXEEXT)
-@extXdrawable_true@@pkg_config_true@extXdrawable_EXECUTABLES_list = \
-@extXdrawable_true@@pkg_config_true@ extXdrawable_demo$(EXEEXT)
+@extXdrawable_true@extXdrawable_EXECUTABLES_list = \
+@extXdrawable_true@ extXdrawable_demo$(EXEEXT)
-@extcairo_true@@pkg_config_true@extcairo_EXECUTABLES_list = \
-@extcairo_true@@pkg_config_true@ ext-cairo-test$(EXEEXT)
+@extcairo_true@extcairo_EXECUTABLES_list = \
+@extcairo_true@ ext-cairo-test$(EXEEXT)
EXECUTABLES_list = \
x00c$(EXEEXT) \
@@ -83,29 +83,23 @@
rm -f $(EXECUTABLES_list)
@gcw_true@plplotcanvas_demo$(EXEEXT): plplotcanvas_demo.c
-@gcw_true@@pkg_config_true@ $(CC) $< -o $@ $(RPATHCMD) \
-@gcw_true@@pkg_config_true@ `$(PKG_CONFIG_ENV) pkg-config @PC_STATIC_OPTION@ --cflags --libs plplot$(LIB_TAG)-gnome2`
-@gcw_true@@pkg_config_false@ $(CC) $< -o $@ \
-@gcw_true@@pkg_config_false@ `plplot-config @PC_STATIC_OPTION@ --cflags --libs --with-gcw`
+@gcw_true@ $(CC) $< -o $@ $(RPATHCMD) \
+@gcw_true@ `$(PKG_CONFIG_ENV) pkg-config @PC_STATIC_OPTION@ --cflags --libs plplot$(LIB_TAG)-gnome2`
@gcw_true@plplotcanvas_animation$(EXEEXT): plplotcanvas_animation.c
-@gcw_true@@pkg_config_true@ $(CC) $< -o $@ $(RPATHCMD) \
-@gcw_true@@pkg_config_true@ `$(PKG_CONFIG_ENV) pkg-config @PC_STATIC_OPTION@ --cflags --libs plplot$(LIB_TAG)-gnome2` \
-@gcw_true@@pkg_config_true@ `pkg-config @PC_STATIC_OPTION@ --cflags --libs gthread-2.0`
-@gcw_true@@pkg_config_false@ $(CC) $< -o \
-@gcw_true@@pkg_config_false@ $@ `plplot-config --cflags --libs --with-gcw` \
-@gcw_true@@pkg_config_false@ @GCWTHREAD_CFLAGS@ @GCWTHREAD_LIBS@
+@gcw_true@ $(CC) $< -o $@ $(RPATHCMD) \
+@gcw_true@ `$(PKG_CONFIG_ENV) pkg-config @PC_STATIC_OPTION@ --cflags --libs plplot$(LIB_TAG)-gnome2` \
+@gcw_true@ `pkg-config @PC_STATIC_OPTION@ --cflags --libs gthread-2.0`
-@extXdrawable_true@@pkg_config_true@extXdrawable_demo$(EXEEXT): extXdrawable_demo.c
-@extXdrawable_true@@pkg_config_true@ $(CC) $< -o $@ $(RPATHCMD) \
-@extXdrawable_true@@pkg_config_true@ `$(PKG_CONFIG_ENV) pkg-config @PC_STATIC_OPTION@ --cflags --libs plplot$(LIB_TAG) gtk+-x11-2.0`
+@extXdrawable_true@extXdrawable_demo$(EXEEXT): extXdrawable_demo.c
+@extXdrawable_true@ $(CC) $< -o $@ $(RPATHCMD) \
+@extXdrawable_true@ `$(PKG_CONFIG_ENV) pkg-config @PC_STATIC_OPTION@ --cflags --libs plplot$(LIB_TAG) gtk+-x11-2.0`
-@extcairo_true@@pkg_config_true@ext-cairo-test$(EXEEXT): ext-cairo-test.c
-@extcairo_true@@pkg_config_true@ $(CC) $< -o $@ $(RPATHCMD) \
-@extcairo_true@@pkg_config_true@ `$(PKG_CONFIG_ENV) pkg-config @PC_STATIC_OPTION@ --cflags --libs plplot$(LIB_TAG) cairo`
+@extcairo_true@ext-cairo-test$(EXEEXT): ext-cairo-test.c
+@extcairo_true@ $(CC) $< -o $@ $(RPATHCMD) \
+@extcairo_true@ `$(PKG_CONFIG_ENV) pkg-config @PC_STATIC_OPTION@ --cflags --libs plplot$(LIB_TAG) cairo`
.c$(EXEEXT):
-@pkg_config_true@ $(CC) $< -o $@ $(RPATHCMD) `$(PKG_CONFIG_ENV) pkg-config @PC_STATIC_OPTION@ --cflags --libs plplot$(LIB_TAG)`
-@pkg_config_false@ $(CC) $< -o $@ `plplot-config --cflags --libs`
+ $(CC) $< -o $@ $(RPATHCMD) `$(PKG_CONFIG_ENV) pkg-config @PC_STATIC_OPTION@ --cflags --libs plplot$(LIB_TAG)`
.SUFFIXES: .c $(EXEEXT)
Modified: trunk/examples/c++/Makefile.examples.in
===================================================================
--- trunk/examples/c++/Makefile.examples.in 2012-01-05 13:00:11 UTC (rev 12122)
+++ trunk/examples/c++/Makefile.examples.in 2012-01-05 13:59:36 UTC (rev 12123)
@@ -24,17 +24,17 @@
CXX = @CXX@
EXEEXT = @EXEEXT@
-@pkg_config_true@LIB_TAG = @LIB_TAG@
-@pkg_config_true@PKG_CONFIG_ENV = @PKG_CONFIG_ENV@
-@pkg_config_true@RPATHCMD = @RPATHCMD@
+LIB_TAG = @LIB_TAG@
+PKG_CONFIG_ENV = @PKG_CONFIG_ENV@
+RPATHCMD = @RPATHCMD@
@qt_gui_true@QT_MOC_EXECUTABLE = @QT_MOC_EXECUTABLE@
-@qt_gui_true@@pkg_config_true@qt_RPATHCMD = @qt_RPATHCMD@
+@qt_gui_true@qt_RPATHCMD = @qt_RPATHCMD@
-@wxwidgets_true@@pkg_config_true@PLPLOTWXWIDGETS_EXECUTABLES_list = \
-@wxwidgets_true@@pkg_config_true@ wxPLplotDemo$(EXEEXT)
+@wxwidgets_true@PLPLOTWXWIDGETS_EXECUTABLES_list = \
+@wxwidgets_true@ wxPLplotDemo$(EXEEXT)
-@qt_gui_true@@pkg_config_true@qt_gui_EXECUTABLES_list = \
-@qt_gui_true@@pkg_config_true@ qt_example$(EXEEXT)
+@qt_gui_true@qt_gui_EXECUTABLES_list = \
+@qt_gui_true@ qt_example$(EXEEXT)
EXECUTABLES_list = \
x01cc$(EXEEXT) \
@@ -79,19 +79,18 @@
clean:
rm -f $(EXECUTABLES_list)
-@wxwidgets_true@@pkg_config_true@wxPLplotDemo$(EXEEXT): wxPLplotDemo.cpp
-@wxwidgets_true@@pkg_config_true@ $(CXX) $< -o $@ $(RPATHCMD) `$(PKG_CONFIG_ENV) pkg-config @PC_STATIC_OPTION@ --cflags --libs plplot$(LIB_TAG)-wxwidgets`
+@wxwidgets_true@wxPLplotDemo$(EXEEXT): wxPLplotDemo.cpp
+@wxwidgets_true@ $(CXX) $< -o $@ $(RPATHCMD) `$(PKG_CONFIG_ENV) pkg-config @PC_STATIC_OPTION@ --cflags --libs plplot$(LIB_TAG)-wxwidgets`
# Note, must filter out -p options which confuse $(QT_MOC_EXECUTABLE). Such
# options (e.g., -pthread) tend to appear in the static driver case.
-@qt_gui_true@@pkg_config_true@moc_qt_PlotWindow.cpp: qt_PlotWindow.h
-@qt_gui_true@@pkg_config_true@ $(QT_MOC_EXECUTABLE) `$(PKG_CONFIG_ENV) pkg-config @PC_STATIC_OPTION@ --cflags-only-I plplot$(LIB_TAG)-qt` $< -o $@
+@qt_gui_true@moc_qt_PlotWindow.cpp: qt_PlotWindow.h
+@qt_gui_true@ $(QT_MOC_EXECUTABLE) `$(PKG_CONFIG_ENV) pkg-config @PC_STATIC_OPTION@ --cflags-only-I plplot$(LIB_TAG)-qt` $< -o $@
-@qt_gui_true@@pkg_config_true@qt_example$(EXEEXT): qt_example.cpp qt_PlotWindow.cpp moc_qt_PlotWindow.cpp
-@qt_gui_true@@pkg_config_true@ $(CXX) qt_example.cpp qt_PlotWindow.cpp moc_qt_PlotWindow.cpp -o $@ $(qt_RPATHCMD) `$(PKG_CONFIG_ENV) pkg-config @PC_STATIC_OPTION@ --cflags --libs plplot$(LIB_TAG)-qt` `$(PKG_CONFIG_ENV) pkg-config @PC_STATIC_OPTION@ --cflags --libs plplot${LIB_TAG}`
+@qt_gui_true@qt_example$(EXEEXT): qt_example.cpp qt_PlotWindow.cpp moc_qt_PlotWindow.cpp
+@qt_gui_true@ $(CXX) qt_example.cpp qt_PlotWindow.cpp moc_qt_PlotWindow.cpp -o $@ $(qt_RPATHCMD) `$(PKG_CONFIG_ENV) pkg-config @PC_STATIC_OPTION@ --cflags --libs plplot$(LIB_TAG)-qt` `$(PKG_CONFIG_ENV) pkg-config @PC_STATIC_OPTION@ --cflags --libs plplot${LIB_TAG}`
.cc$(EXEEXT):
-@pkg_config_true@ $(CXX) $< -o $@ $(RPATHCMD) `$(PKG_CONFIG_ENV) pkg-config @PC_STATIC_OPTION@ --cflags --libs plplot$(LIB_TAG)-c++`
-@pkg_config_false@ $(CXX) $< -o $@ `plplot-config --cflags --libs --with-c++`
+ $(CXX) $< -o $@ $(RPATHCMD) `$(PKG_CONFIG_ENV) pkg-config @PC_STATIC_OPTION@ --cflags --libs plplot$(LIB_TAG)-c++`
.SUFFIXES: .cc $(EXEEXT)
Modified: trunk/examples/d/Makefile.examples.in
===================================================================
--- trunk/examples/d/Makefile.examples.in 2012-01-05 13:00:11 UTC (rev 12122)
+++ trunk/examples/d/Makefile.examples.in 2012-01-05 13:59:36 UTC (rev 12123)
@@ -22,9 +22,9 @@
DC = @DC@
EXEEXT = @EXEEXT@
-@pkg_config_true@LIB_TAG = @LIB_TAG@
-@pkg_config_true@PKG_CONFIG_ENV = @PKG_CONFIG_ENV@
-@pkg_config_true@RPATHCMD = @RPATHCMD@
+LIB_TAG = @LIB_TAG@
+PKG_CONFIG_ENV = @PKG_CONFIG_ENV@
+RPATHCMD = @RPATHCMD@
EXECUTABLES_list = \
x01d$(EXEEXT) \
@@ -66,6 +66,6 @@
rm -f $(EXECUTABLES_list)
.d$(EXEEXT):
-@pkg_config_true@ $(DC) $< -o $@ $(RPATHCMD) `$(PKG_CONFIG_ENV) pkg-config @PC_STATIC_OPTION@ --cflags --libs plplot$(LIB_TAG)-d`
+ $(DC) $< -o $@ $(RPATHCMD) `$(PKG_CONFIG_ENV) pkg-config @PC_STATIC_OPTION@ --cflags --libs plplot$(LIB_TAG)-d`
.SUFFIXES: .d $(EXEEXT)
Modified: trunk/examples/f77/Makefile.examples.in
===================================================================
--- trunk/examples/f77/Makefile.examples.in 2012-01-05 13:00:11 UTC (rev 12122)
+++ trunk/examples/f77/Makefile.examples.in 2012-01-05 13:59:36 UTC (rev 12123)
@@ -24,9 +24,9 @@
F77 = @F77@
EXEEXT = @EXEEXT@
-@pkg_config_true@LIB_TAG = @LIB_TAG@
-@pkg_config_true@PKG_CONFIG_ENV = @PKG_CONFIG_ENV@
-@pkg_config_true@RPATHCMD = @RPATHCMD@
+LIB_TAG = @LIB_TAG@
+PKG_CONFIG_ENV = @PKG_CONFIG_ENV@
+RPATHCMD = @RPATHCMD@
EXECUTABLES_list = \
x01f$(EXEEXT) \
@@ -70,7 +70,6 @@
rm -f $(EXECUTABLES_list)
.f$(EXEEXT):
-@pkg_config_true@ $(F77) $< -o $@ $(RPATHCMD) `$(PKG_CONFIG_ENV) pkg-config @PC_STATIC_OPTION@ --cflags --libs plplot$(LIB_TAG)-f77`
-@pkg_config_false@ $(F77) $< -o $@ `plplot-config --cflags --libs --with-f77`
+ $(F77) $< -o $@ $(RPATHCMD) `$(PKG_CONFIG_ENV) pkg-config @PC_STATIC_OPTION@ --cflags --libs plplot$(LIB_TAG)-f77`
.SUFFIXES: .f $(EXEEXT)
Modified: trunk/examples/f95/Makefile.examples.in
===================================================================
--- trunk/examples/f95/Makefile.examples.in 2012-01-05 13:00:11 UTC (rev 12122)
+++ trunk/examples/f95/Makefile.examples.in 2012-01-05 13:59:36 UTC (rev 12123)
@@ -24,9 +24,9 @@
F95 = @FC@
EXEEXT = @EXEEXT@
-@pkg_config_true@LIB_TAG = @LIB_TAG@
-@pkg_config_true@PKG_CONFIG_ENV = @PKG_CONFIG_ENV@
-@pkg_config_true@RPATHCMD = @RPATHCMD@
+LIB_TAG = @LIB_TAG@
+PKG_CONFIG_ENV = @PKG_CONFIG_ENV@
+RPATHCMD = @RPATHCMD@
EXECUTABLES_list = \
x01f$(EXEEXT) \
@@ -69,7 +69,6 @@
rm -f $(EXECUTABLES_list)
.f90$(EXEEXT):
-@pkg_config_true@ $(F95) @MODULESINCCMD@ $< -o $@ $(RPATHCMD) `$(PKG_CONFIG_ENV) pkg-config @PC_STATIC_OPTION@ --cflags --libs plplot$(LIB_TAG)-f95` -lplf95demolib$(LIB_TAG)
-@pkg_config_false@ $(F95) @MODULESINCCMD@ $< -o $@ `plplot-config --cflags --libs --with-f95`
+ $(F95) @MODULESINCCMD@ $< -o $@ $(RPATHCMD) `$(PKG_CONFIG_ENV) pkg-config @PC_STATIC_OPTION@ --cflags --libs plplot$(LIB_TAG)-f95` -lplf95demolib$(LIB_TAG)
.SUFFIXES: .f90 $(EXEEXT)
Modified: trunk/examples/ocaml/Makefile.examples.in
===================================================================
--- trunk/examples/ocaml/Makefile.examples.in 2012-01-05 13:00:11 UTC (rev 12122)
+++ trunk/examples/ocaml/Makefile.examples.in 2012-01-05 13:59:36 UTC (rev 12123)
@@ -24,13 +24,12 @@
OCAMLC = @OCAML_EXAMPLE_COMPILER@
EXEEXT = @EXEEXT@
-@pkg_config_true@LIB_TAG = @LIB_TAG@
-@pkg_config_true@PKG_CONFIG_ENV = @PKG_CONFIG_ENV@
-@pkg_config_true@RPATHCMD = -ccopt "@RPATHCMD@"
+LIB_TAG = @LIB_TAG@
+PKG_CONFIG_ENV = @PKG_CONFIG_ENV@
+RPATHCMD = -ccopt "@RPATHCMD@"
OCAML_CFLAGS = -g -I @OCAML_INSTALL_DIR@/plplot
-@pkg_config_true@OCAML_LIBS = $(RPATHCMD) -ccopt "-L@CMAKE_INSTALL_LIBDIR@" plplot.@OCAML_EXAMPLE_LIBEXT@ unix.@OCAML_EXAMPLE_LIBEXT@
-@pkg_config_false@OCAML_LIBS = -ccopt "-L@CMAKE_INSTALL_LIBDIR@" plplot.@OCAML_EXAMPLE_LIBEXT@ unix.@OCAML_EXAMPLE_LIBEXT@
+OCAML_LIBS = $(RPATHCMD) -ccopt "-L@CMAKE_INSTALL_LIBDIR@" plplot.@OCAML_EXAMPLE_LIBEXT@ unix.@OCAML_EXAMPLE_LIBEXT@
EXECUTABLES_list = \
x01ocaml$(EXEEXT) \
Modified: trunk/examples/tk/Makefile.examples.in
===================================================================
--- trunk/examples/tk/Makefile.examples.in 2012-01-05 13:00:11 UTC (rev 12122)
+++ trunk/examples/tk/Makefile.examples.in 2012-01-05 13:59:36 UTC (rev 12123)
@@ -23,9 +23,9 @@
CC = @CC@
EXEEXT = @EXEEXT@
-@pkg_config_true@LIB_TAG = @LIB_TAG@
-@pkg_config_true@PKG_CONFIG_ENV = @PKG_CONFIG_ENV@
-@pkg_config_true@RPATHCMD = @RPATHCMD@
+LIB_TAG = @LIB_TAG@
+PKG_CONFIG_ENV = @PKG_CONFIG_ENV@
+RPATHCMD = @RPATHCMD@
EXECUTABLES_list = xtk01$(EXEEXT)
# Second and fourth examples depend on itk.
@@ -37,7 +37,6 @@
rm -f $(EXECUTABLES_list) $(itk_EXECUTABLES_list)
.c$(EXEEXT):
-@pkg_config_true@ $(CC) $< -o $@ $(RPATHCMD) `$(PKG_CONFIG_ENV) pkg-config @PC_STATIC_OPTION@ --cflags --libs plplot$(LIB_TAG)-tcl` -lm
-@pkg_config_false@ $(CC) $< -o $@ `plplot-config --cflags --libs --with-tcl` -lm
+ $(CC) $< -o $@ $(RPATHCMD) `$(PKG_CONFIG_ENV) pkg-config @PC_STATIC_OPTION@ --cflags --libs plplot$(LIB_TAG)-tcl` -lm
.SUFFIXES: .c $(EXEEXT)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
