diff --git a/makefiles/Makefile.third_party.unix.mk b/makefiles/Makefile.third_party.unix.mk index 09c1e59a04..2774f164a9 100644 --- a/makefiles/Makefile.third_party.unix.mk +++ b/makefiles/Makefile.third_party.unix.mk @@ -40,13 +40,11 @@ $(BUILD_DIR)/Makefile: $(CURDIR)/makefiles/Makefile.third_party.unix.mk | $(BUIL .PHONY: clean_third_party # Clean everything. clean_third_party: -$(DEL) Makefile.local - -$(DELREC) $(BUILD_DIR)/* + -$(DELREC) $(BUILD_DIR) + -$(DELREC) bin -$(DELREC) include -$(DELREC) share - -$(DELREC) lib/*.a - -$(DELREC) lib/cmake - -$(DELREC) lib/pkgconfig - + -$(DELREC) lib .PHONY: detect_third_party # Show variables used to find third party detect_third_party: @@ -59,19 +57,13 @@ detect_third_party: @echo USE_GLPK = $(USE_GLPK) @echo USE_CPLEX = $(USE_CPLEX) @echo USE_XPRESS = $(USE_XPRESS) -ifdef UNIX_GLPK_DIR - @echo UNIX_GLPK_DIR = $(UNIX_GLPK_DIR) - @echo GLPK_INC = $(GLPK_INC) - @echo GLPK_LNK = $(GLPK_LNK) +ifdef GLPK_ROOT + @echo GLPK_ROOT = $(GLPK_ROOT) endif -ifdef UNIX_CPLEX_DIR - @echo UNIX_CPLEX_DIR = $(UNIX_CPLEX_DIR) - @echo CPLEX_INC = $(CPLEX_INC) - @echo CPLEX_LNK = $(CPLEX_LNK) +ifdef CPLEX_ROOT + @echo CPLEX_ROOT = $(CPLEX_ROOT) endif -ifdef UNIX_XPRESS_DIR - @echo UNIX_XPRESS_DIR = $(UNIX_XPRESS_DIR) - @echo XPRESS_INC = $(XPRESS_INC) - @echo XPRESS_LNK = $(XPRESS_LNK) +ifdef XPRESS_ROOT + @echo XPRESS_ROOT = $(XPRESS_ROOT) endif @echo diff --git a/makefiles/Makefile.third_party.win.mk b/makefiles/Makefile.third_party.win.mk index 98c9ea2f92..9a75f8a671 100644 --- a/makefiles/Makefile.third_party.win.mk +++ b/makefiles/Makefile.third_party.win.mk @@ -42,12 +42,11 @@ $(BUILD_DIR)/ortools.sln: $(CURDIR)/makefiles/Makefile.third_party.win.mk | $(BU .PHONY: clean_third_party # clean everything. clean_third_party: -$(DEL) Makefile.local - -$(DELREC) $(BUILD_DIR)\\* + -$(DELREC) $(BUILD_DIR) + -$(DELREC) bin -$(DELREC) include -$(DELREC) share - -$(DELREC) lib\\*.lib - -$(DELREC) lib\\cmake - -$(DELREC) lib\\pkgconfig + -$(DELREC) lib .PHONY: detect_third_party # Show variables used to find third party detect_third_party: @@ -60,21 +59,13 @@ detect_third_party: @echo USE_GLPK = $(USE_GLPK) @echo USE_CPLEX = $(USE_CPLEX) @echo USE_XPRESS = $(USE_XPRESS) -ifdef WINDOWS_GLPK_DIR - @echo WINDOWS_GLPK_DIR = $(WINDOWS_GLPK_DIR) - @echo GLPK_INC = $(GLPK_INC) - @echo DYNAMIC_GLPK_LNK = $(DYNAMIC_GLPK_LNK) - @echo STATIC_GLPK_LNK = $(STATIC_GLPK_LNK) +ifdef GLPK_ROOT + @echo GLPK_ROOT = $(GLPK_ROOT) endif -ifdef WINDOWS_CPLEX_DIR - @echo WINDOWS_CPLEX_DIR = $(WINDOWS_CPLEX_DIR) - @echo CPLEX_INC = $(CPLEX_INC) - @echo DYNAMIC_CPLEX_LNK = $(DYNAMIC_CPLEX_LNK) - @echo STATIC_CPLEX_LNK = $(STATIC_CPLEX_LNK) +ifdef CPLEX_ROOT + @echo CPLEX_ROOT = $(CPLEX_ROOT) endif -ifdef WINDOWS_XPRESS_DIR - @echo WINDOWS_XPRESS_DIR = $(WINDOWS_XPRESS_DIR) - @echo XPRESS_INC = $(XPRESS_INC) - @echo XPRESS_LNK = $(XPRESS_LNK) +ifdef XPRESS_ROOT + @echo XPRESS_ROOT = $(XPRESS_ROOT) endif @echo off & echo(