expo/expoweb
1
0
Fork 0
mirror of https://expo.survex.com/repositories/expoweb/.git/ synced 2024-11-21 23:01:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update Makefile to use 1623-and-1626 instead of 'all'

Browse Source
This commit is contained in:
expo on server 2019-06-29 02:45:33 +01:00
parent e4f32a5d54
commit 0ec3fb3717
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
Makefile
View File

@ -19,7 +19,7 @@ everything: autogen_pages folklist 3dfiles tarfiles qmlists
###########
autogen_pages: noinfo/lengths.dat noinfo/all.pos noinfo/cavestats
autogen_pages: noinfo/lengths.dat noinfo/1623-and-1626.pos noinfo/cavestats
# cavestats should be BUILT AUTOMATICALLY rather than having to be
# built manually in a survex build tree.
@ -30,8 +30,8 @@ autogen_pages: noinfo/lengths.dat noinfo/all.pos noinfo/cavestats
noinfo/lengths.dat:
python noinfo/create_dplong_table.py
noinfo/all.pos: noinfo/all.3d
3dtopos noinfo/all.3d noinfo/all.pos
noinfo/1623-and-1626.pos: noinfo/1623-and-1626.3d
3dtopos noinfo/1623-and-1626.3d noinfo/1623-and-1626.pos
noinfo/cavestats:
# This needs a built copy of survex sources. See
@ -39,7 +39,7 @@ noinfo/cavestats:
###########
folklist: folk/index.htm
folklist: folk/index.htm $(dataset_path)/1623-and-1626.svx
folk/index.htm: folk/folk.csv scripts/make-folklist.py
python scripts/make-folklist.py < folk/folk.csv > folk/index.htm
@ -73,10 +73,10 @@ qmlists: 1623/204/qm.html 1623/204/atoz.html 1623/234/qm.html 1623/258/qm.html
###########
3dfiles: noinfo/all.3d 1623/204/204.3d 1623/234/234.3d 1623/76/76.3d noinfo/alltracks.3d
3dfiles: noinfo/1623-and-1626.3d 1623/204/204.3d 1623/234/234.3d 1623/76/76.3d noinfo/alltracks.3d
noinfo/all.3d: $(shell $(svxtrace_cmd) $(dataset_path)/all)
cavern $(cavern_flags) $(dataset_path)/all -o noinfo/all.3d
noinfo/1623-and-1626.3d: $(shell $(svxtrace_cmd) $(dataset_path)/1623-and-1626)
cavern $(cavern_flags) $(dataset_path)/1623-and-1626 -o noinfo/1623-and-1626.3d
1623/204/204.3d: $(shell $(svxtrace_cmd) $(dataset_path)/caves-1623/204/204)
cavern $(cavern_flags) $(dataset_path)/caves-1623/204/204 -o 1623/204/204.3d
@ -111,7 +111,7 @@ dump3d: noinfo/prospecting_guide_scripts/dump3d
tarfiles: noinfo/all.tgz 1623/204/surveydata.tgz 1623/234/surveydata.tgz 1623/76/surveydata.tgz
noinfo/all.tgz: noinfo/all.3d
noinfo/all.tgz: noinfo/1623-and-1626.3d
tar $(tar_flags) noinfo/all.tgz -C $(dataset_path)/.. loser
1623/204/surveydata.tgz: 1623/204/204.3d
@ -129,9 +129,9 @@ noinfo/all.tgz: noinfo/all.3d
###########
clean:
cut -d "," -f 6 noinfo/CAVETAB2.CSV | xargs rm -f
#cut -d "," -f 6 noinfo/CAVETAB2.CSV | xargs rm -f
rm -f indxal.htm folk/index.htm noinfo/all.pos
rm -f noinfo/all.3d 1623/204/204.3d 1623/234/234.3d 1623/76/76.3d
rm -f noinfo/1623-and-1626.3d noinfo/1623.3d 1623/204/204.3d 1623/234/234.3d 1623/76/76.3d
rm -f 1623/204/surveydata.tgz 1623/234/surveydata.tgz 1623/76/surveydata.tgz noinfo/all.tgz
rm -f $(surveydir_path)/surveytable.html
rm -f report.html