Changeset 24244 for branches/cnb_branches/cnb_branch_20090301/extsrc/gpcsw/Makefile.in

Timestamp:

May 26, 2009, 1:59:32 PM (17 years ago)

Author:

beaumont

Message:

merged with trunk

Location:

branches/cnb_branches/cnb_branch_20090301

Files:

• . (modified) (1 prop)
• extsrc/gpcsw/Makefile.in (modified) (3 diffs)

branches/cnb_branches/cnb_branch_20090301/extsrc/gpcsw/Makefile.in

@@ -8 +8 @@
         cp -f man/man1/* @MANDIR@/man1/
 
+clean:
+        echo "dummy clean"
+
 update:
         mkdir -p gpcsrc
@@ -15 +18 @@
         svn export https://svn.ifa.hawaii.edu/gpc/repos/sw/trunk/ThisIsTopLevel gpcsrc/ThisIsTopLevel
         svn export https://svn.ifa.hawaii.edu/gpc/repos/sw/trunk/missing_protos.h gpcsrc/missing_protos.h
-# remove existing directories
-        rm -rf gpcsrc/fits
-        rm -rf gpcsrc/analysis
 # required subdirs
-        svn export https://svn.ifa.hawaii.edu/gpc/repos/sw/trunk/analysis/libpscoords gpcsrc/analysis/libpscoords
-        svn export https://svn.ifa.hawaii.edu/gpc/repos/sw/trunk/analysis/libpsf gpcsrc/analysis/libpsf
-        svn export https://svn.ifa.hawaii.edu/gpc/repos/sw/trunk/fits/libfh gpcsrc/fits/libfh
-        svn export https://svn.ifa.hawaii.edu/gpc/repos/sw/trunk/fits/libfhreg gpcsrc/fits/libfhreg
-        svn export https://svn.ifa.hawaii.edu/gpc/repos/sw/trunk/fits/burntool gpcsrc/fits/burntool
-# replace the standard gpc/Make.Common with our repaired version (g77 -> gfortran)
-        cp -f Make.Common.fixed gpcsrc/Make.Common
+        svn export https://svn.ifa.hawaii.edu/gpc/repos/sw/trunk/analysis/libpscoords gpcsrc/analysis/libpscoords.new
+        svn export https://svn.ifa.hawaii.edu/gpc/repos/sw/trunk/analysis/libpsf gpcsrc/analysis/libpsf.new
+        svn export https://svn.ifa.hawaii.edu/gpc/repos/sw/trunk/fits/libfh gpcsrc/fits/libfh.new
+        svn export https://svn.ifa.hawaii.edu/gpc/repos/sw/trunk/fits/libfhreg gpcsrc/fits/libfhreg.new
+        svn export https://svn.ifa.hawaii.edu/gpc/repos/sw/trunk/fits/burntool gpcsrc/fits/burntool.new
+# replace new files with those from the imported directories
+        cp -rf gpcsrc/analysis/libpscoords.new/* gpcsrc/analysis/libpscoords
+        cp -rf gpcsrc/analysis/libpsf.new/* gpcsrc/analysis/libpsf
+        cp -rf gpcsrc/fits/libfh.new/* gpcsrc/fits/libfh
+        cp -rf gpcsrc/fits/libfhreg.new/* gpcsrc/fits/libfhreg
+        cp -rf gpcsrc/fits/burntool.new/* gpcsrc/fits/burntool
+# remove the temp directory
+        rm -rf gpcsrc/analysis/libpscoords.new
+        rm -rf gpcsrc/analysis/libpsf.new
+        rm -rf gpcsrc/fits/libfh.new
+        rm -rf gpcsrc/fits/libfhreg.new
+        rm -rf gpcsrc/fits/burntool.new
+# modify burntool to avoid libpsf (which requires fortran)
+        cp -f burntool.nopsf/Makefile gpcsrc/fits/burntool
+        cp -f burntool.nopsf/psfstats.c gpcsrc/fits/burntool
+
 # set up links
         ln -sf ../Make.Common gpcsrc/analysis/Make.Common
@@ -39 +53 @@
         cd gpcsrc && make -C fits/libfhreg install
         cd gpcsrc && make -C analysis/libpscoords install
-        cd gpcsrc && make -C analysis/libpsf install
         cd gpcsrc && make -C fits/burntool install
-