From e89c99ce5e5474173d354778b531f2dff8eff25e Mon Sep 17 00:00:00 2001
From: Lionel Elie Mamane <lionel@mamane.lu>
Date: Fri, 9 Dec 2011 01:17:19 +0100
Subject: Revert "mysqlcppconn: force recompilation when switching between
 different bindings"

This reverts commit 694627b7860fb69f115c020719c5b149d328f9ef.
---
 mysqlcppconn/makefile.mk | 34 ++++++++++++++--------------------
 1 file changed, 14 insertions(+), 20 deletions(-)

(limited to 'mysqlcppconn')

diff --git a/mysqlcppconn/makefile.mk b/mysqlcppconn/makefile.mk
index a6534a2f43ed..d7fa8a6f380f 100644
--- a/mysqlcppconn/makefile.mk
+++ b/mysqlcppconn/makefile.mk
@@ -27,21 +27,10 @@
 
 PRJ=.
 
-# distro-specific builds want to link against a particular mysql library
-# then they do not require mysql-devel package at runtime
-# So put mysql-connector-cpp/driver/nativeapi/binding_config.h into separate patch
-# and enable/disable MYSQLCLIENT_STATIC_BINDING according to the used mysql library
-.IF "$(SYSTEM_MYSQL)" == "YES"
-MYSQL_BINDING=static
-.ELSE
-MYSQL_BINDING=dynamic
-.ENDIF
-
 PRJNAME=mysqlcppconn
-EXT_PROJECT_NAME=mysql-connector-c++-1.1.0
-TARGET=so_mysqlcppconn_binding-$(MYSQL_BINDING)
-TARFILE_ROOTDIR=mysql-connector-c++-1.1.0_binding-$(MYSQL_BINDING)
+TARGET=so_mysqlcppconn
 
+EXT_PROJECT_NAME=mysql-connector-c++-1.1.0
 
 # --- Settings -----------------------------------------------------
 
@@ -60,6 +49,16 @@ ADDITIONAL_FILES=\
 CONVERTFILES=\
                 cppconn$/build_config.h
 
+# distro-specific builds want to link against a particular mysql library
+# then they do not require mysql-devel package at runtime
+# So put mysql-connector-cpp/driver/nativeapi/binding_config.h into separate patch
+# and enable/disable MYSQLCLIENT_STATIC_BINDING according to the used mysql library
+.IF "$(SYSTEM_MYSQL)" == "YES"
+MYSQL_BINDING=static
+.ELSE
+MYSQL_BINDING=dynamic
+.ENDIF
+
 PATCH_FILES=\
     $(TARFILE_NAME).patch \
     $(TARFILE_NAME)-mysql-binding-$(MYSQL_BINDING).patch \
@@ -67,11 +66,6 @@ PATCH_FILES=\
 
 BUILD_DIR=driver
 BUILD_ACTION = \
-	    if test -e ../../lastbuild; then LASTBUILD=$$(cat ../../lastbuild); else LASTBUILD='$(MYSQL_BINDING)'; fi && \
-	    if test "$${LASTBUILD}" != "$(MYSQL_BINDING)"; then \
-               rm -f ../$(BACK_PATH)/slo/* ../../so_built_so_mysqlcppconn_binding-$${LASTBUILD}; \
-            fi && \
-            echo "$(MYSQL_BINDING)" > ../../lastbuild && \
             cd nativeapi \
          && $(MAKE) $(MFLAGS) $(CALLMACROS) \
          && cd .. \
@@ -94,9 +88,9 @@ BUILD_ACTION = \
 NORMALIZE_FLAG_FILE=so_normalized_$(TARGET)
 
 $(PACKAGE_DIR)$/$(NORMALIZE_FLAG_FILE) : $(PACKAGE_DIR)$/$(BUILD_FLAG_FILE)
-    @$(GNUCOPY) -r $(PACKAGE_DIR)$/$(TARFILE_ROOTDIR)$/driver$/mysql_driver.h $(INCCOM)
+    @$(GNUCOPY) -r $(PACKAGE_DIR)$/$(EXT_PROJECT_NAME)$/driver$/mysql_driver.h $(INCCOM)
     -@$(MKDIRHIER) $(INCCOM)$/cppconn
-    @$(GNUCOPY) -r $(PACKAGE_DIR)$/$(TARFILE_ROOTDIR)$/cppconn$/* $(INCCOM)$/cppconn
+    @$(GNUCOPY) -r $(PACKAGE_DIR)$/$(EXT_PROJECT_NAME)$/cppconn$/* $(INCCOM)$/cppconn
     @$(TOUCH) $(PACKAGE_DIR)$/$(NORMALIZE_FLAG_FILE)
 
 normalize: $(PACKAGE_DIR)$/$(NORMALIZE_FLAG_FILE)
-- 
cgit