From 2db341cff86b3d25cfc5216811d40e341105a9ba Mon Sep 17 00:00:00 2001
From: Derek Bankieris <derek.r.bankieris@nasa.gov>
Date: Tue, 28 Mar 2017 15:57:40 -0500
Subject: [PATCH] Revert (almost all of) 2e4c3286

Sadly, we cannot yet require SWIG 2.0.

Refs #400
---
 libexec/trick/make_makefile_swig  | 8 ++------
 share/trick/makefiles/trickify.mk | 8 ++------
 2 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/libexec/trick/make_makefile_swig b/libexec/trick/make_makefile_swig
index 512105bd..f3a1520c 100755
--- a/libexec/trick/make_makefile_swig
+++ b/libexec/trick/make_makefile_swig
@@ -211,13 +211,9 @@ build/top.i: build/CP_instances
 
 SWIG_SRC = \$(subst .i,.cpp,\$(SWIG_I)) $swig_src_dir/top.cpp
 
-\$(SWIG_SRC) : %.cpp: %.i %.d | \$(SWIG_I)
+\$(SWIG_SRC) : %.cpp: %.i | \$(SWIG_I)
 \t\$(PRINT_SWIG)
-\t\$(ECHO_CMD)\$(SWIG) \$(TRICK_INCLUDE) \$(TRICK_DEFINES) \$(TRICK_VERSIONS) \$(SWIG_FLAGS) -c++ -python -includeall -ignoremissing -w201,303,325,362,389,401,451 -MMD -MP -outdir trick -o \$@ \$<
-
-\$(SWIG_SRC:.cpp=.d): ;
-
--include \$(SWIG_SRC:.cpp=.d)
+\t\$(ECHO_CMD)\$(SWIG) \$(TRICK_INCLUDE) \$(TRICK_DEFINES) \$(TRICK_VERSIONS) \$(SWIG_FLAGS) -c++ -python -includeall -ignoremissing -w201,303,325,362,389,401,451 -outdir trick -o \$@ \$<
 
 # SWIG_OBJECTS =================================================================
 
diff --git a/share/trick/makefiles/trickify.mk b/share/trick/makefiles/trickify.mk
index 1e68201d..033b6739 100644
--- a/share/trick/makefiles/trickify.mk
+++ b/share/trick/makefiles/trickify.mk
@@ -126,13 +126,9 @@ $(SWIG_OBJECTS): %.o: %.cpp
 	$(info $(call COLOR,Compiling)  $<)
 	@$(TRICK_CPPC) $(TRICK_CXXFLAGS) $(TRICK_SYSTEM_CXXFLAGS) $(PYTHON_INCLUDES) -Wno-unused-parameter -Wno-shadow -c -o $@ $<
 
-$(SWIG_OBJECTS:.o=.cpp): %.cpp: %.i %.d | $(TRICKIFY_PYTHON_DIR) $(SWIG_OBJECTS:.o=.i)
+$(SWIG_OBJECTS:.o=.cpp): %.cpp: %.i | $(TRICKIFY_PYTHON_DIR) $(SWIG_OBJECTS:.o=.i)
 	$(info $(call COLOR,SWIGing)    $<)
-	@$(SWIG) $(TRICK_INCLUDE) $(TRICK_DEFINES) $(TRICK_VERSIONS) $(SWIG_FLAGS) -c++ -python -includeall -ignoremissing -w201,303,325,362,389,401,451 -MMD -MP -outdir $(TRICKIFY_PYTHON_DIR) -o $@ $<
-
-$(SWIG_OBJECTS:.o=.d): ;
-
--include $(SWIG_OBJECTS:.o=.d)
+	@$(SWIG) $(TRICK_INCLUDE) $(TRICK_DEFINES) $(TRICK_VERSIONS) $(SWIG_FLAGS) -c++ -python -includeall -ignoremissing -w201,303,325,362,389,401,451 -outdir $(TRICKIFY_PYTHON_DIR) -o $@ $<
 
 define create_convert_swig_rule
 build/%_py.i: /%.$1