|
From: <ai...@us...> - 2008-12-17 20:27:38
|
Revision: 9172
http://plplot.svn.sourceforge.net/plplot/?rev=9172&view=rev
Author: airwin
Date: 2008-12-17 20:27:34 +0000 (Wed, 17 Dec 2008)
Log Message:
-----------
Move Makefile.examples to Makefile.examples.in so we can configure it.
Modified Paths:
--------------
trunk/examples/CMakeLists.txt
Added Paths:
-----------
trunk/examples/Makefile.examples.in
Removed Paths:
-------------
trunk/examples/Makefile.examples
Modified: trunk/examples/CMakeLists.txt
===================================================================
--- trunk/examples/CMakeLists.txt 2008-12-17 19:59:43 UTC (rev 9171)
+++ trunk/examples/CMakeLists.txt 2008-12-17 20:27:34 UTC (rev 9172)
@@ -84,7 +84,13 @@
add_subdirectory(ocaml)
endif(ENABLE_ocaml)
-install(FILES Makefile.examples
+configure_file(
+ ${CMAKE_CURRENT_SOURCE_DIR}/Makefile.examples.in
+ ${CMAKE_CURRENT_BINARY_DIR}/Makefile.examples
+ @ONLY
+ )
+
+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/Makefile.examples
DESTINATION ${DATA_DIR}/examples
RENAME Makefile
)
Deleted: trunk/examples/Makefile.examples
===================================================================
--- trunk/examples/Makefile.examples 2008-12-17 19:59:43 UTC (rev 9171)
+++ trunk/examples/Makefile.examples 2008-12-17 20:27:34 UTC (rev 9172)
@@ -1,36 +0,0 @@
-# examples/Makefile.examples.in for PLplot
-###
-### Process this file with configure to produce Makefile.examples
-###
-# Copyright (C) 2004 Alan W. Irwin
-#
-# This file is part of PLplot.
-#
-# PLplot is free software; you can redistribute it and/or modify
-# it under the terms of the GNU Library General Public License as published by
-# the Free Software Foundation; version 2 of the License.
-#
-# PLplot is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Library General Public License for more details.
-#
-# You should have received a copy of the GNU Library General Public License
-# along with the file PLplot; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-
-# This Makefile should not be used in the build tree. It is meant for use
-# only in the install tree. It is first configured, then installed
-# (with the name Makefile) in the _installed_ examples directory as a
-# convenience to the user for building all the examples without having
-# to invoke make in the individual sub-directories of examples.
-
-SUBDIRS = c c++ f77 f95 tk java ada ocaml
-all clean:
- target=`echo $@`; \
- list='$(SUBDIRS)'; for subdir in $$list; do \
- if test -d "$$subdir"; then \
- echo "Making $$target in $$subdir"; \
- (cd $$subdir && $(MAKE) $$target); \
- fi; \
- done
Copied: trunk/examples/Makefile.examples.in (from rev 9170, trunk/examples/Makefile.examples)
===================================================================
--- trunk/examples/Makefile.examples.in (rev 0)
+++ trunk/examples/Makefile.examples.in 2008-12-17 20:27:34 UTC (rev 9172)
@@ -0,0 +1,36 @@
+# examples/Makefile.examples.in for PLplot
+###
+### Process this file with configure to produce Makefile.examples
+###
+# Copyright (C) 2004 Alan W. Irwin
+#
+# This file is part of PLplot.
+#
+# PLplot is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Library General Public License as published by
+# the Free Software Foundation; version 2 of the License.
+#
+# PLplot is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU Library General Public License for more details.
+#
+# You should have received a copy of the GNU Library General Public License
+# along with the file PLplot; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+
+# This Makefile should not be used in the build tree. It is meant for use
+# only in the install tree. It is first configured, then installed
+# (with the name Makefile) in the _installed_ examples directory as a
+# convenience to the user for building all the examples without having
+# to invoke make in the individual sub-directories of examples.
+
+SUBDIRS = c c++ f77 f95 tk java ada ocaml
+all clean:
+ target=`echo $@`; \
+ list='$(SUBDIRS)'; for subdir in $$list; do \
+ if test -d "$$subdir"; then \
+ echo "Making $$target in $$subdir"; \
+ (cd $$subdir && $(MAKE) $$target); \
+ fi; \
+ done
Property changes on: trunk/examples/Makefile.examples.in
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision
Added: svn:mergeinfo
+
Added: svn:eol-style
+ native
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|