Index: trunk/src/route-rnd/Makefile.dep =================================================================== --- trunk/src/route-rnd/Makefile.dep (revision 1452) +++ trunk/src/route-rnd/Makefile.dep (revision 1453) @@ -22,7 +22,8 @@ ../../src_3rd/gengeo2d/common.h ../../src_3rd/gengeo2d/prim.h rtpoly.h \ compat_misc.h netseg.h ../../src_3rd/gengeo2d/cline.h \ ../../src_3rd/gengeo2d/vect.h ../../src_3rd/gengeo2d/box.h \ - ../../src_3rd/genht/hash.h ../../src_3rd/genht/ht_utils.h + ../../src_3rd/gengeo2d/carc.h ../../src_3rd/genht/hash.h \ + ../../src_3rd/genht/ht_utils.h io.o: io.c config.h route-rnd.h ../../src_3rd/genvector/vtp0.h \ ../../src_3rd/genvector/genvector_impl.h \ ../../src_3rd/genvector/genvector_undef.h conf.h io.h @@ -141,7 +142,7 @@ ../../src_3rd/gengeo2d/common.h ../../src_3rd/gengeo2d/prim.h rtpoly.h \ util_grid.h ../../src_3rd/genvector/vtd0.h data.h \ ../../src/plugins//rt_horver/escape.h ../../src/plugins//rt_horver/bus.h \ - ../../src/plugins//rt_horver/hpkp.h + ../../src/plugins//rt_horver/hpkp.h route_res.h ../../src/plugins//rt_horver/optimize.o: \ ../../src/plugins//rt_horver/optimize.c ../../src_3rd/genht/htpp.h \ ../../src_3rd/genht/ht.h ../../src_3rd/genht/hash.h \ @@ -155,7 +156,7 @@ ../../src_3rd/gengeo2d/common.h ../../src_3rd/gengeo2d/prim.h rtpoly.h \ util_grid.h ../../src_3rd/genvector/vtd0.h data.h \ ../../src/plugins//rt_horver/escape.h ../../src/plugins//rt_horver/bus.h \ - ../../src/plugins//rt_horver/optimize.h netseg.h + ../../src/plugins//rt_horver/optimize.h netseg.h route_res.h ../../src/plugins//rt_horver/bus.o: ../../src/plugins//rt_horver/bus.c \ ../../src/plugins//rt_horver/bus.h util_grid.h \ ../../src_3rd/genvector/vtd0.h ../../src_3rd/genvector/genvector_impl.h \ @@ -185,9 +186,10 @@ ../../src_3rd/libcdtr/point.h ../../src_3rd/libcdtr/list/list.h \ ../../src_3rd/libcdtr/edge.h ../../src_3rd/libcdtr/triangle.h \ ../../src_3rd/libualloc/stacks_api.h ../../src_3rd/libualloc/libualloc.h \ - ../../src/plugins//rt_topo/crbs.h + ../../src/plugins//rt_topo/crbs.h libgrbs/grbs.h libgrbs/rtree.h \ + libgrbs/addr_hash.h libgrbs/grbs.h ../../src_3rd/genht/ht.h ../../src/plugins//rt_topo/vt2br.o: ../../src/plugins//rt_topo/vt2br.c \ - ../../src/plugins//rt_topo/vt2br.h data.h ../../src_3rd/genvector/vtp0.h \ + data.h ../../src_3rd/genvector/vtp0.h \ ../../src_3rd/genvector/genvector_impl.h \ ../../src_3rd/genvector/genvector_undef.h \ ../../src_3rd/genlist/gendlist.h ../../src_3rd/genht/htsp.h \ @@ -195,6 +197,7 @@ ../../src_3rd/genrtree/genrtree_api.h geo.h config.h \ ../../src_3rd/gengeo2d/typecfg_double_double.h ../../src_3rd/opc89.h \ ../../src_3rd/gengeo2d/common.h ../../src_3rd/gengeo2d/prim.h rtpoly.h \ + ../../src/plugins//rt_topo/vt2br.h \ ../../src_3rd/genvector/genvector_impl.c ../../src/plugins//rt_topo/vtcr.o: ../../src/plugins//rt_topo/vtcr.c \ ../../src/plugins//rt_topo/vtcr.h \ @@ -246,8 +249,9 @@ ../../src/plugins//rt_topo/rt_topo.h \ ../../src/plugins//rt_topo/trbs_util.c \ ../../src/plugins//rt_topo/trbs_cdt.c ../../src_3rd/genvector/vtd0.h \ - geo.h ../../src_3rd/gengeo2d/cline.h ../../src_3rd/gengeo2d/vect.h \ - ../../src_3rd/gengeo2d/box.h ../../src/plugins//rt_topo/trbs_vis.c \ + ../../src_3rd/libcdtr/debug.h geo.h ../../src_3rd/gengeo2d/cline.h \ + ../../src_3rd/gengeo2d/vect.h ../../src_3rd/gengeo2d/box.h \ + ../../src/plugins//rt_topo/trbs_vis.c \ ../../src/plugins//rt_topo/trbs_route.c \ ../../src_3rd/libusearch/a_star_api.h ../../src_3rd/genprique/fibheap.h \ ../../src_3rd/libusearch/common.h ../../src/plugins//rt_topo/trbs_pull.c @@ -259,15 +263,53 @@ ../../src_3rd/genrtree/genrtree_api.h geo.h config.h \ ../../src_3rd/gengeo2d/typecfg_double_double.h ../../src_3rd/opc89.h \ ../../src_3rd/gengeo2d/common.h ../../src_3rd/gengeo2d/prim.h rtpoly.h \ - io.h route_res.h data.h ../../src/plugins//rt_topo/crbs.h \ - ../../src/plugins//rt_topo/rt_topo.h ../../src_3rd/libcdtr/cdt.h \ - ../../src_3rd/libcdtr/typedefs.h ../../src_3rd/libcdtr/point.h \ - ../../src_3rd/libcdtr/list/list.h ../../src_3rd/libcdtr/edge.h \ - ../../src_3rd/libcdtr/triangle.h ../../src_3rd/libualloc/stacks_api.h \ - ../../src_3rd/libualloc/libualloc.h \ - ../../src/plugins//rt_topo/crbs_cdt.c ../../src_3rd/genvector/vtd0.h \ - geo.h ../../src_3rd/gengeo2d/cline.h ../../src_3rd/gengeo2d/vect.h \ - ../../src_3rd/gengeo2d/box.h \ - ../../src/plugins//rt_topo/crbs_route.c \ - ../../src_3rd/libusearch/a_star_api.h ../../src_3rd/genprique/fibheap.h \ - ../../src_3rd/libusearch/common.h + io.h route_res.h data.h libgrbs/debug.h libgrbs/grbs.h \ + ../../src_3rd/libualloc/stacks_api.h ../../src_3rd/libualloc/libualloc.h \ + libgrbs/rtree.h ../../src_3rd/gengeo2d/cline.h \ + ../../src_3rd/gengeo2d/vect.h ../../src_3rd/gengeo2d/box.h \ + ../../src/plugins//rt_topo/crbs.h ../../src/plugins//rt_topo/rt_topo.h \ + ../../src_3rd/libcdtr/cdt.h ../../src_3rd/libcdtr/typedefs.h \ + ../../src_3rd/libcdtr/point.h ../../src_3rd/libcdtr/list/list.h \ + ../../src_3rd/libcdtr/edge.h ../../src_3rd/libcdtr/triangle.h \ + libgrbs/addr_hash.h libgrbs/grbs.h ../../src_3rd/genht/ht.h \ + ../../src_3rd/genht/hash.h ../../src/plugins//rt_topo/crbs_cdt.c \ + ../../src_3rd/genvector/vtd0.h libgrbs/route.h geo.h \ + ../../src/plugins//rt_topo/crbs_route.c ../../src_3rd/genht/ht.c \ + ../../src_3rd/genht/ht_inlines.h ../../src_3rd/libusearch/a_star_api.h \ + ../../src_3rd/genprique/fibheap.h ../../src_3rd/libusearch/common.h +../../src_3rd/libgrbs/grbs.o: ../../src_3rd/libgrbs/grbs.c \ + ../../src_3rd/libgrbs/grbs.h ../../src_3rd/genlist/gendlist.h \ + ../../src_3rd/libualloc/stacks_api.h ../../src_3rd/libualloc/libualloc.h \ + libgrbs/rtree.h ../../src_3rd/genrtree/genrtree_api.h \ + ../../src_3rd/libgrbs/route.h ../../src_3rd/libgrbs/force_attach.h \ + ../../src_3rd/libgrbs/geo.c ../../src_3rd/libgrbs/geo.h \ + ../../src_3rd/libgrbs/obj_line.c ../../src_3rd/libgrbs/geo_isc.h \ + ../../src_3rd/libgrbs/config.h \ + ../../src_3rd/gengeo2d/typecfg_double_double.h ../../src_3rd/opc89.h \ + ../../src_3rd/gengeo2d/common.h ../../src_3rd/gengeo2d/prim.h \ + ../../src_3rd/gengeo2d/cline.h ../../src_3rd/gengeo2d/vect.h \ + ../../src_3rd/gengeo2d/box.h ../../src_3rd/gengeo2d/intersect.h \ + ../../src_3rd/gengeo2d/carc.h ../../src_3rd/gengeo2d/sline.h \ + ../../src_3rd/gengeo2d/sarc.h ../../src_3rd/libgrbs/obj_arc.c \ + ../../src_3rd/libgrbs/obj_point.c ../../src_3rd/libgrbs/addr.c \ + ../../src_3rd/libgrbs/collision.c ../../src_3rd/libgrbs/route_common.c \ + ../../src_3rd/libgrbs/route_next.c ../../src_3rd/libgrbs/route_realize.c \ + ../../src_3rd/libgrbs/route_remove.c \ + ../../src_3rd/libgrbs/route_postproc.c \ + ../../src_3rd/libgrbs/route_detach.c \ + ../../src_3rd/libgrbs/force_attach.c +../../src_3rd/libgrbs/addr_hash.o: ../../src_3rd/libgrbs/addr_hash.c \ + ../../src_3rd/libgrbs/addr_hash.h ../../src_3rd/libgrbs/grbs.h \ + ../../src_3rd/genlist/gendlist.h ../../src_3rd/libualloc/stacks_api.h \ + ../../src_3rd/libualloc/libualloc.h libgrbs/rtree.h \ + ../../src_3rd/genrtree/genrtree_api.h +../../src_3rd/libgrbs/rtree.o: ../../src_3rd/libgrbs/rtree.c \ + ../../src_3rd/libgrbs/rtree.h ../../src_3rd/genrtree/genrtree_api.h \ + ../../src_3rd/genrtree/genrtree_impl.h \ + ../../src_3rd/genrtree/genrtree_search.h \ + ../../src_3rd/genrtree/genrtree_delete.h +../../src_3rd/libgrbs/debug.o: ../../src_3rd/libgrbs/debug.c \ + ../../src_3rd/libgrbs/debug.h libgrbs/grbs.h \ + ../../src_3rd/genlist/gendlist.h ../../src_3rd/libualloc/stacks_api.h \ + ../../src_3rd/libualloc/libualloc.h libgrbs/rtree.h \ + ../../src_3rd/genrtree/genrtree_api.h ../../src_3rd/libgrbs/geo.h