From c9b8b7b3e6adceee1c5a88b2d89891da04e82af6 Mon Sep 17 00:00:00 2001 From: Laurent Perron Date: Sun, 9 Apr 2017 21:56:47 +0200 Subject: [PATCH] Fix routing deps --- makefiles/Makefile.cpp.mk | 8 +++--- makefiles/Makefile.gen.mk | 52 +++++++++++++++----------------------- makefiles/Makefile.java.mk | 6 ++--- 3 files changed, 27 insertions(+), 39 deletions(-) diff --git a/makefiles/Makefile.cpp.mk b/makefiles/Makefile.cpp.mk index 56475dab85..c0355ba8b1 100755 --- a/makefiles/Makefile.cpp.mk +++ b/makefiles/Makefile.cpp.mk @@ -65,7 +65,7 @@ ortoolslibs: $(OR_TOOLS_LIBS) CVRPTW_LIBS = $(LIB_DIR)/$(LIB_PREFIX)cvrptw_lib.$(LIB_SUFFIX) CVRPTW_DEPS = \ $(EX_DIR)/cpp/cvrptw_lib.h \ - $(ROUTING_DEPS) + $(CP_DEPS) $(SRC_DIR)/constraint_solver/routing.h CVRPTW_LNK = $(PRE_LIB)cvrptw_lib$(POST_LIB) $(OR_TOOLS_LNK) cvrptwlibs: $(CVRPTW_LIBS) @@ -156,7 +156,7 @@ ccexe: $(CC_BINARIES) CVRPTW_OBJS=\ $(OBJ_DIR)/cvrptw_lib.$O -$(OBJ_DIR)/cvrptw_lib.$O: $(EX_DIR)/cpp/cvrptw_lib.cc $(EX_DIR)/cpp/cvrptw_lib.h $(ROUTING_DEPS) +$(OBJ_DIR)/cvrptw_lib.$O: $(EX_DIR)/cpp/cvrptw_lib.cc $(EX_DIR)/cpp/cvrptw_lib.h $(CP_DEPS) $(SRC_DIR)/constraint_solver/routing.h $(CCC) $(CFLAGS) -c $(EX_DIR)$Scpp/cvrptw_lib.cc $(OBJ_OUT)$(OBJ_DIR)$Scvrptw_lib.$O $(LIB_DIR)/$(LIB_PREFIX)cvrptw_lib.$(LIB_SUFFIX): $(CVRPTW_OBJS) @@ -435,7 +435,7 @@ $(OBJ_DIR)/nqueens2.$O: $(EX_DIR)/cpp/nqueens2.cc $(CP_DEPS) $(BIN_DIR)/nqueens2$E: $(OR_TOOLS_LIBS) $(OBJ_DIR)/nqueens2.$O $(CCC) $(CFLAGS) $(OBJ_DIR)/nqueens2.$O $(OR_TOOLS_LNK) $(OR_TOOLS_LD_FLAGS) $(EXE_OUT)$(BIN_DIR)$Snqueens2$E -$(OBJ_DIR)/pdptw.$O: $(EX_DIR)/cpp/pdptw.cc $(ROUTING_DEPS) +$(OBJ_DIR)/pdptw.$O: $(EX_DIR)/cpp/pdptw.cc $(CP_DEPS) $(SRC_DIR)/constraint_solver/routing.h $(CCC) $(CFLAGS) -c $(EX_DIR)$Scpp/pdptw.cc $(OBJ_OUT)$(OBJ_DIR)$Spdptw.$O $(BIN_DIR)/pdptw$E: $(OR_TOOLS_LIBS) $(OBJ_DIR)/pdptw.$O @@ -465,7 +465,7 @@ $(OBJ_DIR)/sports_scheduling.$O: $(EX_DIR)/cpp/sports_scheduling.cc $(CP_DEPS) $(BIN_DIR)/sports_scheduling$E: $(OR_TOOLS_LIBS) $(OBJ_DIR)/sports_scheduling.$O $(CCC) $(CFLAGS) $(OBJ_DIR)/sports_scheduling.$O $(OR_TOOLS_LNK) $(OR_TOOLS_LD_FLAGS) $(EXE_OUT)$(BIN_DIR)$Ssports_scheduling$E -$(OBJ_DIR)/tsp.$O: $(EX_DIR)/cpp/tsp.cc $(ROUTING_DEPS) +$(OBJ_DIR)/tsp.$O: $(EX_DIR)/cpp/tsp.cc $(CP_DEPS) $(SRC_DIR)/constraint_solver/routing.h $(CCC) $(CFLAGS) -c $(EX_DIR)$Scpp/tsp.cc $(OBJ_OUT)$(OBJ_DIR)$Stsp.$O $(BIN_DIR)/tsp$E: $(OR_TOOLS_LIBS) $(OBJ_DIR)/tsp.$O diff --git a/makefiles/Makefile.gen.mk b/makefiles/Makefile.gen.mk index 5f907ad86f..fd2a343618 100644 --- a/makefiles/Makefile.gen.mk +++ b/makefiles/Makefile.gen.mk @@ -1227,7 +1227,6 @@ $(OBJ_DIR)/graph/bellman_ford.$O: \ $(OBJ_DIR)/graph/cliques.$O: \ $(SRC_DIR)/graph/cliques.cc \ $(SRC_DIR)/graph/cliques.h \ - $(SRC_DIR)/base/callback.h \ $(SRC_DIR)/base/hash.h $(CCC) $(CFLAGS) -c $(SRC_DIR)/graph/cliques.cc $(OBJ_OUT)$(OBJ_DIR)$Sgraph$Scliques.$O @@ -1264,7 +1263,6 @@ $(OBJ_DIR)/graph/min_cost_flow.$O: \ $(OBJ_DIR)/graph/shortestpaths.$O: \ $(SRC_DIR)/graph/shortestpaths.cc \ $(SRC_DIR)/graph/shortestpaths.h \ - $(SRC_DIR)/base/callback.h \ $(SRC_DIR)/base/casts.h \ $(SRC_DIR)/base/commandlineflags.h \ $(SRC_DIR)/base/hash.h \ @@ -2280,19 +2278,6 @@ $(SRC_DIR)/linear_solver/glop_utils.h: \ $(SRC_DIR)/linear_solver/linear_solver.h \ $(SRC_DIR)/lp_data/lp_types.h -$(SRC_DIR)/linear_solver/linear_expr.h: - -$(SRC_DIR)/linear_solver/linear_solver_ext.h: \ - $(SRC_DIR)/linear_solver/linear_solver.h \ - $(SRC_DIR)/base/commandlineflags.h \ - $(SRC_DIR)/base/hash.h \ - $(SRC_DIR)/base/integral_types.h \ - $(SRC_DIR)/base/logging.h \ - $(SRC_DIR)/base/macros.h \ - $(SRC_DIR)/base/sparsetable.h \ - $(SRC_DIR)/base/strutil.h \ - $(SRC_DIR)/base/timer.h - $(SRC_DIR)/linear_solver/linear_solver.h: \ $(SRC_DIR)/linear_solver/linear_expr.h \ $(GEN_DIR)/linear_solver/linear_solver.pb.h \ @@ -2605,21 +2590,16 @@ $(SRC_DIR)/constraint_solver/constraint_solveri.h: \ $(SRC_DIR)/constraint_solver/hybrid.h: \ $(SRC_DIR)/constraint_solver/constraint_solver.h -$(SRC_DIR)/constraint_solver/routing_flags.h: \ - $(GEN_DIR)/constraint_solver/routing_parameters.pb.h \ - $(SRC_DIR)/base/commandlineflags.h - $(SRC_DIR)/constraint_solver/routing.h: \ $(SRC_DIR)/constraint_solver/constraint_solver.h \ $(SRC_DIR)/constraint_solver/constraint_solveri.h \ $(GEN_DIR)/constraint_solver/routing_parameters.pb.h \ - $(SRC_DIR)/base/adjustable_priority_queue.h \ + $(SRC_DIR)/constraint_solver/routing_types.h \ $(SRC_DIR)/base/adjustable_priority_queue-inl.h \ + $(SRC_DIR)/base/adjustable_priority_queue.h \ $(SRC_DIR)/base/callback.h \ $(SRC_DIR)/base/commandlineflags.h \ $(SRC_DIR)/base/hash.h \ - $(SRC_DIR)/base/integral_types.h \ - $(SRC_DIR)/base/int_type.h \ $(SRC_DIR)/base/int_type_indexed_vector.h \ $(SRC_DIR)/base/logging.h \ $(SRC_DIR)/base/macros.h \ @@ -2627,6 +2607,10 @@ $(SRC_DIR)/constraint_solver/routing.h: \ $(SRC_DIR)/util/sorted_interval_list.h \ $(SRC_DIR)/graph/graph.h +$(SRC_DIR)/constraint_solver/routing_flags.h: \ + $(GEN_DIR)/constraint_solver/routing_parameters.pb.h \ + $(SRC_DIR)/base/commandlineflags.h + $(SRC_DIR)/constraint_solver/routing_neighborhoods.h: \ $(SRC_DIR)/constraint_solver/constraint_solver.h \ $(SRC_DIR)/constraint_solver/constraint_solveri.h \ @@ -2707,16 +2691,6 @@ $(OBJ_DIR)/constraint_solver/collect_variables.$O: \ $(SRC_DIR)/base/stl_util.h $(CCC) $(CFLAGS) -c $(SRC_DIR)/constraint_solver/collect_variables.cc $(OBJ_OUT)$(OBJ_DIR)$Sconstraint_solver$Scollect_variables.$O -$(OBJ_DIR)/constraint_solver/constraints.$O: \ - $(SRC_DIR)/constraint_solver/constraints.cc \ - $(SRC_DIR)/constraint_solver/constraint_solver.h \ - $(SRC_DIR)/constraint_solver/constraint_solveri.h \ - $(SRC_DIR)/base/integral_types.h \ - $(SRC_DIR)/base/logging.h \ - $(SRC_DIR)/util/saturated_arithmetic.h \ - $(SRC_DIR)/util/string_array.h - $(CCC) $(CFLAGS) -c $(SRC_DIR)/constraint_solver/constraints.cc $(OBJ_OUT)$(OBJ_DIR)$Sconstraint_solver$Sconstraints.$O - $(OBJ_DIR)/constraint_solver/constraint_solver.$O: \ $(SRC_DIR)/constraint_solver/constraint_solver.cc \ $(SRC_DIR)/constraint_solver/constraint_solver.h \ @@ -2736,6 +2710,17 @@ $(OBJ_DIR)/constraint_solver/constraint_solver.$O: \ $(SRC_DIR)/util/tuple_set.h $(CCC) $(CFLAGS) -c $(SRC_DIR)/constraint_solver/constraint_solver.cc $(OBJ_OUT)$(OBJ_DIR)$Sconstraint_solver$Sconstraint_solver.$O +$(OBJ_DIR)/constraint_solver/constraints.$O: \ + $(SRC_DIR)/constraint_solver/constraints.cc \ + $(SRC_DIR)/constraint_solver/constraint_solver.h \ + $(SRC_DIR)/constraint_solver/constraint_solveri.h \ + $(SRC_DIR)/base/integral_types.h \ + $(SRC_DIR)/base/join.h \ + $(SRC_DIR)/base/logging.h \ + $(SRC_DIR)/util/saturated_arithmetic.h \ + $(SRC_DIR)/util/string_array.h + $(CCC) $(CFLAGS) -c $(SRC_DIR)/constraint_solver/constraints.cc $(OBJ_OUT)$(OBJ_DIR)$Sconstraint_solver$Sconstraints.$O + $(OBJ_DIR)/constraint_solver/count_cst.$O: \ $(SRC_DIR)/constraint_solver/count_cst.cc \ $(SRC_DIR)/constraint_solver/constraint_solver.h \ @@ -2933,6 +2918,7 @@ $(OBJ_DIR)/constraint_solver/local_search.$O: \ $(SRC_DIR)/base/commandlineflags.h \ $(SRC_DIR)/base/hash.h \ $(SRC_DIR)/base/integral_types.h \ + $(SRC_DIR)/base/join.h \ $(SRC_DIR)/base/logging.h \ $(SRC_DIR)/base/macros.h \ $(SRC_DIR)/base/map_util.h \ @@ -3002,11 +2988,13 @@ $(OBJ_DIR)/constraint_solver/routing.$O: \ $(SRC_DIR)/constraint_solver/routing.cc \ $(GEN_DIR)/constraint_solver/model.pb.h \ $(SRC_DIR)/constraint_solver/routing.h \ + $(SRC_DIR)/constraint_solver/routing_neighborhoods.h \ $(SRC_DIR)/base/callback.h \ $(SRC_DIR)/base/casts.h \ $(SRC_DIR)/base/commandlineflags.h \ $(SRC_DIR)/base/hash.h \ $(SRC_DIR)/base/integral_types.h \ + $(SRC_DIR)/base/join.h \ $(SRC_DIR)/base/logging.h \ $(SRC_DIR)/base/map_util.h \ $(SRC_DIR)/base/stl_util.h \ diff --git a/makefiles/Makefile.java.mk b/makefiles/Makefile.java.mk index 48bf00cdec..3fcab392c2 100755 --- a/makefiles/Makefile.java.mk +++ b/makefiles/Makefile.java.mk @@ -4,10 +4,10 @@ JAVA_ORTOOLS_LIBS= $(LIB_DIR)/com.google.ortools.jar $(LIB_DIR)/$(LIB_PREFIX)jniortools.$(JNI_LIB_EXT) -$(GEN_DIR)/constraint_solver/constraint_solver_java_wrap.cc: $(SRC_DIR)/constraint_solver/java/constraint_solver.swig $(SRC_DIR)/constraint_solver/java/routing.swig $(SRC_DIR)/base/base.swig $(SRC_DIR)/util/java/vector.swig $(SRC_DIR)/base/base.swig $(SRC_DIR)/util/java/proto.swig $(ROUTING_DEPS) +$(GEN_DIR)/constraint_solver/constraint_solver_java_wrap.cc: $(SRC_DIR)/constraint_solver/java/constraint_solver.swig $(SRC_DIR)/constraint_solver/java/routing.swig $(SRC_DIR)/base/base.swig $(SRC_DIR)/util/java/vector.swig $(SRC_DIR)/base/base.swig $(SRC_DIR)/util/java/proto.swig $(CP_DEPS) $(SRC_DIR)/constraint_solver/routing.h $(SWIG_BINARY) -I$(INC_DIR) -c++ -java -o $(GEN_DIR)$Sconstraint_solver$Sconstraint_solver_java_wrap.cc -package com.google.ortools.constraintsolver -module operations_research_constraint_solver -outdir $(GEN_DIR)$Scom$Sgoogle$Sortools$Sconstraintsolver $(SRC_DIR)$Sconstraint_solver$Sjava$Srouting.swig -$(OBJ_DIR)/swig/constraint_solver_java_wrap.$O: $(GEN_DIR)/constraint_solver/constraint_solver_java_wrap.cc $(ROUTING_DEPS) +$(OBJ_DIR)/swig/constraint_solver_java_wrap.$O: $(GEN_DIR)/constraint_solver/constraint_solver_java_wrap.cc $(CP_DEPS) $(SRC_DIR)/constraint_solver/routing.h $(CCC) $(JNIFLAGS) $(JAVA_INC) -c $(GEN_DIR)$Sconstraint_solver$Sconstraint_solver_java_wrap.cc $(OBJ_OUT)$(OBJ_DIR)$Sswig$Sconstraint_solver_java_wrap.$O $(GEN_DIR)/algorithms/knapsack_solver_java_wrap.cc: $(SRC_DIR)/algorithms/java/knapsack_solver.swig $(SRC_DIR)/base/base.swig $(SRC_DIR)/util/java/vector.swig $(SRC_DIR)/algorithms/knapsack_solver.h @@ -403,4 +403,4 @@ clean_java: -$(DEL) $(OBJ_DIR)$Scom$Sgoogle$Sortools$Salgorithms$S*.class -$(DEL) $(OBJ_DIR)$Scom$Sgoogle$Sortools$Slinearsolver$S*.class -$(DEL) $(OBJ_DIR)$Scom$Sgoogle$Sortools$Ssamples$S*.class - -$(DEL) $(OBJ_DIR)$Sswig$S*java_wrap.$O \ No newline at end of file + -$(DEL) $(OBJ_DIR)$Sswig$S*java_wrap.$O