[Teem-commit] SF.net SVN: teem:[4589] NrrdIO/trunk

[<Mic...@us...>]

Revision: 4589
          http://teem.svn.sourceforge.net/teem/?rev=4589&view=rev
Author:   MichelKitware
Date:     2010-03-01 17:27:34 +0000 (Mon, 01 Mar 2010)

Log Message:
-----------
BUG: changes to deal with itk_zlib.h requirement in wiki procedure. 

Modified Paths:
--------------
    NrrdIO/trunk/pre-GNUmakefile
    NrrdIO/trunk/sample-GNUmakefile

Modified: NrrdIO/trunk/pre-GNUmakefile
===================================================================
--- NrrdIO/trunk/pre-GNUmakefile	2010-03-01 16:11:45 UTC (rev 4588)
+++ NrrdIO/trunk/pre-GNUmakefile	2010-03-01 17:27:34 UTC (rev 4589)
@@ -96,17 +96,17 @@
 ### from air, biff, and nrrd
 ###
 .PHONY: all
-all: $(TEEM_HDRS) $(NEED_SRCS) $(NEED_PRIV_HDRS) NrrdIO.h NrrdIO_Srcs.txt
+all: $(TEEM_HDRS) $(NEED_SRCS) $(NEED_PRIV_HDRS) NrrdIO.h $(ITK_SRC_ROOT)/Utilities/itk_zlib.h NrrdIO_Srcs.txt
 
 ### NrrdIO.h is basically the result of cat'ing together all the 
 ### teem headers in $(NEED_HDRS), but we do need to "unteem" them.
 ###
 $(NEED_PUB_HDRS):
-	tail +22 $(TEEM_SRC_ROOT)/src/$@ \
+	tail --lines=+22 $(TEEM_SRC_ROOT)/src/$@ \
          | perl unteem.pl \
          | grep -v HAS_BEEN_INCLUDED > $(notdir $@)
 $(NEED_PRIV_HDRS):
-	tail +22 $(TEEM_SRC_ROOT)/src/$@ \
+	tail --lines=+22 $(TEEM_SRC_ROOT)/src/$@ \
          | cat preamble.c - \
          | perl unteem.pl \
          | grep -v HAS_BEEN_INCLUDED > $(notdir $@)
@@ -123,7 +123,7 @@
 ### The teem*.h headers: we need only change the pre-amble here
 ###
 teem/%.h: 
-	tail +22 $(TEEM_SRC_ROOT)/include/$(notdir $@) \
+	tail --lines=+22 $(TEEM_SRC_ROOT)/include/$(notdir $@) \
           | cat preamble.c - > $(notdir $@)
 
 ### The rest: by design, these targets have the library names as part
@@ -131,7 +131,7 @@
 ### source file without any VPATH games
 ###
 %.h %.c:
-	tail +22 $(TEEM_SRC_ROOT)/src/$@ \
+	tail --lines=+22 $(TEEM_SRC_ROOT)/src/$@ \
           | cat preamble.c - \
           | perl unteem.pl \
           | grep -v HAS_BEEN_INCLUDED > $(notdir $@)

Modified: NrrdIO/trunk/sample-GNUmakefile
===================================================================
--- NrrdIO/trunk/sample-GNUmakefile	2010-03-01 16:11:45 UTC (rev 4588)
+++ NrrdIO/trunk/sample-GNUmakefile	2010-03-01 17:27:34 UTC (rev 4589)
@@ -50,7 +50,7 @@
 
 ### Any architecture-specific flags to cc
 ###
-CCFLAGS = -O3 -ffloat-store -W -Wall
+CCFLAGS = -O3 -ffloat-store -W -Wall -I$(ITK_BIN_ROOT)/Utilities -I$(ITK_SRC_ROOT)/Utilities
 
 ### This also has to be set per-architecture- whether or not we need to
 ### run ranlib on libraries created via ar
@@ -62,11 +62,11 @@
 ### find the zlib includes and libraries
 ###
 ZLIB_IPATH =
-ZLIB_LPATH =
+ZLIB_LPATH =$(ITK_BIN_ROOT)/bin/libitkzlib.a
 
 ### We'll build the static libNrrdIO library, and one test program
 ###
-ALL = libNrrdIO.a sampleIO
+ALL = libNrrdIO.a sampleIO 
 all: $(ALL)
 
 ### The libNrrdIO library is built from the objects from the source files


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