[Plplot-cvs] SF.net SVN: plplot:[12756] trunk

[<ai...@us...>]

Revision: 12756
          http://sourceforge.net/p/plplot/code/12756
Author:   airwin
Date:     2013-11-26 17:40:50 +0000 (Tue, 26 Nov 2013)
Log Message:
-----------
Fix the traditional (Makefile + pkg-config) build of the installed examples
by configuring and installing the plplottcltk_Main(d).pc pkg-config file
associated with libplplottcltk_Main, and using that file to
configure the build of the xtk?? examples.

Tested by Alan W. Irwin <ai...@us...> on Linux using
CMake options -DDEFAULT_NO_CAIRO_DEVICES=ON -DPLD_wxwidgets=OFF
-DDEFAULT_NO_BINDINGS=ON -DENABLE_tcl=ON -DENABLE_itcl=ON
-DENABLE_tk=ON -DENABLE_itk=ON (to limit most tests just to C and Tcl
and friends) for the core build and the test_noninteractive and
test_interactive targets for the traditional build system of the
installed examples.

Modified Paths:
--------------
    trunk/bindings/tcl/CMakeLists.txt
    trunk/examples/tk/Makefile.examples.in

Modified: trunk/bindings/tcl/CMakeLists.txt
===================================================================
--- trunk/bindings/tcl/CMakeLists.txt	2013-11-26 06:56:39 UTC (rev 12755)
+++ trunk/bindings/tcl/CMakeLists.txt	2013-11-26 17:40:50 UTC (rev 12756)
@@ -547,7 +547,7 @@
       )
     install(FILES ${PC_CONFIGURED_FILE} DESTINATION ${PKG_CONFIG_DIR})
 
-    set(PC_DATA "tcl:Tcl/Tk:Tcl/Tk bindings, :plplottcltk_Main${LIB_TAG}")
+    set(PC_DATA "tcl_Main:Tcl_Main/Tk_Main:Tcl_Main/Tk_Main bindings, :plplottcltk_Main${LIB_TAG}")
 
     string(REGEX REPLACE "^(.*):.*:.*:.*$" "\\1" BINDING ${PC_DATA})
     set(PC_FILE_SUFFIX "-${BINDING}")

Modified: trunk/examples/tk/Makefile.examples.in
===================================================================
--- trunk/examples/tk/Makefile.examples.in	2013-11-26 06:56:39 UTC (rev 12755)
+++ trunk/examples/tk/Makefile.examples.in	2013-11-26 17:40:50 UTC (rev 12756)
@@ -37,6 +37,6 @@
 	rm -f $(EXECUTABLES_list) $(itk_EXECUTABLES_list)
 
 .c$(EXEEXT):
-	$(CC) $< -o $@ $(RPATHCMD) `$(PKG_CONFIG_ENV) pkg-config @PC_STATIC_OPTION@ --cflags --libs plplot$(LIB_TAG)-tcl` -lm
+	$(CC) $< -o $@ $(RPATHCMD) `$(PKG_CONFIG_ENV) pkg-config @PC_STATIC_OPTION@ --cflags --libs plplot$(LIB_TAG)-tcl_Main plplot$(LIB_TAG)-tcl plplot$(LIB_TAG)` -lm
 
 .SUFFIXES: .c $(EXEEXT)

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.