Skip to content

[WIP] Split osm executables into a library and exe #6

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open

[WIP] Split osm executables into a library and exe #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
48b4f70
Begin to split osm executable into a library (Category, Clipping, Coa…
kit-ty-kate Nov 17, 2014
fc31719
Continuing splitting (Contraction)
kit-ty-kate Nov 17, 2014
0c7c346
Fix Osm_contraction
kit-ty-kate Nov 29, 2014
963a833
Split Display
kit-ty-kate Nov 29, 2014
15bc292
Move Douglas_peucker and Geometry to osm/lib
kit-ty-kate Nov 29, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
314 changes: 168 additions & 146 deletions .depend
View file
Open in desktop

Large diffs are not rendered by default.

14 changes: 7 additions & 7 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,12 +23,12 @@ DATABASE=\
projection.cmx table.cmx dictionary.cmx column_ops.cmx rtree.cmx

OSM=\
geometry.cmx
lib/osm_geometry.cmx

ROUTING=\
routing_profile.cmx profile_car.cmx profile_pedestrian.cmx

DIRS=-I generic -I database -I osm
DIRS=-I generic -I database -I osm -I osm/lib

OBJS= $(addprefix generic/,$(GENERIC)) $(addprefix database/,$(DATABASE)) \
$(addprefix osm/,$(OSM))
Expand All @@ -46,22 +46,22 @@ load: $(OBJS) osm/parser.cmx osm/prepare.cmx
multipolygons: $(OBJS) osm/multipolygons.cmx
$(OCAMLOPT) $(OPTLINKFLAGS) -o $@ $^

linear: $(OBJS) osm/category.cmx osm/linear.cmx
linear: $(OBJS) osm/lib/osm_category.cmx osm/linear.cmx
$(OCAMLOPT) $(OPTLINKFLAGS) -o $@ $^

surfaces: $(OBJS) osm/douglas_peucker.cmx osm/category.cmx osm/surfaces.cmx
surfaces: $(OBJS) osm/lib/osm_douglas_peucker.cmx osm/lib/osm_category.cmx osm/surfaces.cmx
$(OCAMLOPT) $(OPTLINKFLAGS) -o $@ $^

highway: $(OBJS) $(addprefix osm/, $(ROUTING)) osm/highway.cmx
$(OCAMLOPT) $(OPTLINKFLAGS) -o $@ $^

contraction: $(OBJS) osm/contraction.cmx
contraction: $(OBJS) osm/lib/osm_contraction.cmx osm/contraction.cmx
$(OCAMLOPT) $(OPTLINKFLAGS) -o $@ $^

display: $(OBJS) osm/routing.cmx osm/line_smoothing.cmx osm/douglas_peucker.cmx osm/category.cmx osm/display.cmx
display: $(OBJS) osm/routing.cmx osm/line_smoothing.cmx osm/lib/osm_douglas_peucker.cmx osm/lib/osm_category.cmx osm/lib/osm_display.cmx osm/display.cmx
$(OCAMLOPT) $(OPTLINKFLAGS) -o $@ $^

coastline: $(OBJS) osm/category.cmx osm/douglas_peucker.cmx osm/clipping.cmx osm/coastline.cmx
coastline: $(OBJS) osm/lib/osm_category.cmx osm/lib/osm_douglas_peucker.cmx osm/lib/osm_clipping.cmx osm/lib/osm_coastline.cmx osm/coastline.cmx
$(OCAMLOPT) $(OPTLINKFLAGS) -o $@ $^

clean::
Expand Down
Loading