adapted Makefile to git

Makefile

@@ -29,29 +29,18 @@ MAKE_ENV = $(TANGO_DIR)/Libraries/cppserver/common
 #
 PACKAGE_NAME = HexaSmarMotor
 MAJOR_VERS   = 1
-MINOR_VERS   = 10 
+MINOR_VERS   = 12 
 RELEASE      = Release_$(MAJOR_VERS)_$(MINOR_VERS)
 
-usetrunk ?= 1
 
 # #=============================================================================
 # # RELEASE_TYPE
 # # - DEBUG     : debug symbols - no optimization
 # # - OPTIMIZED : no debug symbols - optimization level set to O2
 # #-----------------------------------------------------------------------------
-ifeq ($(usetrunk), 1)
-RELEASE_TYPE = DEBUG
-endif
-ifeq ($(usetrunk), 0)
-RELEASE_TYPE = OPTIMIZED
-endif
+RELEASE_TYPE ?= OPTIMIZED
 
-ifeq ($(usetrunk), 1)
-CTRLDIR = $(TANGO_DIR)/DeviceClasses/Motion/Hexapods/HexaSmarUnit/trunk
-endif
-ifeq ($(usetrunk), 0)
-CTRLDIR = $(shell find $(TANGO_DIR)/DeviceClasses/Motion/Hexapods/HexaSmarUnit/tags -type d -regex '.*Release_[0-9]*_[0-9]*' | sort -t '_' -k2 -k3 -nr | head -1)
-endif
+CTRLDIR = $(TANGO_DIR)/DeviceClasses/Motion/Hexapods/HexaSmarUnit/
 
 #=============================================================================
 # OUTPUT_TYPE can be one of the following :
@@ -70,7 +59,7 @@ OUTPUT_TYPE = DEVICE
 #	- $HOME/DeviceServers if OUTPUT_TYPE is DEVICE
 #	- ../bin for others
 #
-OUTPUT_DIR = ./bin/$(BIN_DIR)
+# OUTPUT_DIR = ./bin/$(BIN_DIR)
 
 
 
@@ -88,7 +77,7 @@ INC_DIR_USER= -I . -I $(CTRLDIR)
 #   - for a device server, tango libraries directories are automatically appended
 #   - '-L ../lib' is automatically appended in all cases
 #
-LIB_DIR_USER= -L$(CTRLDIR)/lib
+LIB_DIR_USER= -L$(CTRLDIR)/$(_libdir)
 
 #=============================================================================
 # LFLAGS_USR is the list of user link flags
@@ -156,12 +145,12 @@ ADDITIONAL_OBJS = $(CTRLDIR)/lib/libHexaSmarUnit.a
 #=============================================================================
 #	include common targets
 #
-SPECIFIC_ALL_TARGET=$(CTRLDIR)/lib/libHexaSmarUnit.a
+SPECIFIC_ALL_TARGET=$(CTRLDIR)/$(_libdir)/libHexaSmarUnit.a
 SPECIFIC_CLEAN_TARGET=libclean
 
 include $(MAKE_ENV)/common_target.opt
-$(CTRLDIR)/lib/libHexaSmarUnit.a:
-	cd $(CTRLDIR) && $(MAKE) OUTPUT_TYPE=STATIC_LIB RELEASE_TYPE=$(RELEASE_TYPE) OUTPUT_TYPE=STATIC_LIB usetrunk=$(usetrunk) OUTPUT_DIR="$(CTRLDIR)/lib"
+$(CTRLDIR)/$(_libdir)/libHexaSmarUnit.a:
+	cd $(CTRLDIR) && $(MAKE) OUTPUT_TYPE=STATIC_LIB RELEASE_TYPE=$(RELEASE_TYPE)
 libclean:
 	cd $(CTRLDIR) && $(MAKE) clean