From 7bff2c8cdb29bb3d8a763c453e0d63c30f0d8ce0 Mon Sep 17 00:00:00 2001
From: Kalle Vahlman <kalle.vahlman@movial.com>
Date: Mon, 18 Jun 2012 11:55:41 +0300
Subject: Separate 32 bit and 64 bit builds completely, control with LBITS

---
 Makefile          | 21 ++++++++++++---------
 lcmodule/Makefile | 19 +++++++++++--------
 2 files changed, 23 insertions(+), 17 deletions(-)

diff --git a/Makefile b/Makefile
index 9e11145..d31b510 100644
--- a/Makefile
+++ b/Makefile
@@ -161,7 +161,7 @@ ifeq ($(LBITS),64)
 # do 64 bit stuff here, like set some CFLAGS
 #
 CXXFLAGS += -DLINUX_64
-start-build: configfile setup_folders $(LIB_x32) $(LIB_x64) lcmodule
+start-build: configfile setup_folders $(LIB_x64) lcmodule
 else
 #
 # do 32 bit stuff here
@@ -430,9 +430,10 @@ endif
 
 start-install: start-build
 ifeq ($(BUILD_WIN),)
-	install -m 0755 $(BUILDFOLDER)/liblcdriver.$(LIB_EXTENSION) $(LCD_INSTALLDIR)
 ifeq ($(LBITS),64)
 	install -m 0755 $(BUILDFOLDER)/liblcdriver_x64.$(LIB_EXTENSION) $(LCD_INSTALLDIR)
+else
+	install -m 0755 $(BUILDFOLDER)/liblcdriver.$(LIB_EXTENSION) $(LCD_INSTALLDIR)
 endif
 else
 
@@ -453,15 +454,16 @@ clean:
 	$(MAKE) -C . start-clean BUILD_WIN=2
 
 start-clean:
-	$(if $(BUILDFOLDER), \
-		$(if $(LIB_x32_OBJ_DIR), \
-			@rm -rf $(BUILDFOLDER)/$(LIB_x32_OBJ_DIR) \
-			@rm -rf $(BUILDFOLDER),),)
 ifeq ($(LBITS),64)
 	$(if $(BUILDFOLDER), \
 		$(if $(LIB_x64_OBJ_DIR), \
 			@rm -rf $(BUILDFOLDER)/$(LIB_x64_OBJ_DIR) \
 			@rm -rf $(BUILDFOLDER),),)
+else
+	$(if $(BUILDFOLDER), \
+		$(if $(LIB_x32_OBJ_DIR), \
+			@rm -rf $(BUILDFOLDER)/$(LIB_x32_OBJ_DIR) \
+			@rm -rf $(BUILDFOLDER),),)
 endif
 	$(if $(BUILDFOLDER), \
 		@rm -f $(BUILDFOLDER)/*.so* \
@@ -474,13 +476,14 @@ distclean: clean
 	$(if $(AUTO_DIR_LIB), \
 		@rm -f $(AUTO_DIR_LIB)/*.cpp \
 		@rm -f $(AUTO_DIR_LIB)/*.h,)
-	$(if $(LCD_INSTALLDIR), \
-		@rm -f $(LCD_INSTALLDIR)/LCDriver_CNH1606432.dll \
-		@rm -f $(LCD_INSTALLDIR)/liblcdriver.$(LIB_EXTENSION),)
 ifeq ($(LBITS),64)
 	$(if $(LCD_INSTALLDIR), \
 		@rm -f $(LCD_INSTALLDIR)/LCDriver_CNH1606432_x64.dll \
 		@rm -f $(LCD_INSTALLDIR)/liblcdriver_x64.$(LIB_EXTENSION),)
+else
+	$(if $(LCD_INSTALLDIR), \
+		@rm -f $(LCD_INSTALLDIR)/LCDriver_CNH1606432.dll \
+		@rm -f $(LCD_INSTALLDIR)/liblcdriver.$(LIB_EXTENSION),)
 endif
 	$(if $(config_file), \
 		@rm -f $(config_file),)
diff --git a/lcmodule/Makefile b/lcmodule/Makefile
index fbc9f72..bbd5333 100644
--- a/lcmodule/Makefile
+++ b/lcmodule/Makefile
@@ -148,7 +148,7 @@ ifeq ($(LBITS),64)
 #
 # do 64 bit stuff here, like set some CFLAGS
 #
-start-build: configfile setup_folders $(LIB_x32) $(LIB_x64)
+start-build: configfile setup_folders $(LIB_x64)
 else
 #
 # do 32 bit stuff here
@@ -431,9 +431,10 @@ endif
 
 start-install: start-build
 ifeq ($(BUILD_WIN),)
-	install -p -m 0755 $(LIB_x32) ${LCMLIB_INSTALLDIR}
 ifeq ($(LBITS),64)
 	install -p -m 0755 $(LIB_x64) ${LCMLIB_INSTALLDIR}
+else
+	install -p -m 0755 $(LIB_x32) ${LCMLIB_INSTALLDIR}
 endif
 else
 ifeq ($(BUILD_WIN),1)
@@ -453,9 +454,10 @@ endif
 
 start-install: start-build
 ifeq ($(BUILD_WIN),)
-	install -p -m 0755 $(LIB_x32) ${LCMLIB_INSTALLDIR}
 ifeq ($(LBITS),64)
 	install -p -m 0755 $(LIB_x64) ${LCMLIB_INSTALLDIR}
+else
+	install -p -m 0755 $(LIB_x32) ${LCMLIB_INSTALLDIR}
 endif
 else
 ifeq ($(BUILD_WIN),1)
@@ -472,17 +474,18 @@ clean:
 	$(MAKE) -C . start-clean BUILD_WIN=2
 
 start-clean:
-	$(if ${BUILDFOLDER}, \
-		$(if ${LIB_x32_OBJ_DIR}, \
-			@rm -f ${BUILDFOLDER}/${LIB_x32_OBJ_DIR}/*.o \
-			@rm -rf ${BUILDFOLDER}/${LIB_x32_OBJ_DIR} \
-			@rm -rf ${BUILDFOLDER},),)
 ifeq ($(LBITS),64)
 	$(if ${BUILDFOLDER}, \
 		$(if ${LIB_x64_OBJ_DIR}, \
 			@rm -f ${BUILDFOLDER}/${LIB_x64_OBJ_DIR}/*.o \
 			@rm -rf ${BUILDFOLDER}/${LIB_x64_OBJ_DIR} \
 			@rm -rf ${BUILDFOLDER},),)
+else
+	$(if ${BUILDFOLDER}, \
+		$(if ${LIB_x32_OBJ_DIR}, \
+			@rm -f ${BUILDFOLDER}/${LIB_x32_OBJ_DIR}/*.o \
+			@rm -rf ${BUILDFOLDER}/${LIB_x32_OBJ_DIR} \
+			@rm -rf ${BUILDFOLDER},),)
 endif
 	$(if ${BUILDFOLDER}, \
 		@rm -f ${BUILDFOLDER}/*.so* \
-- 
cgit v1.2.3