Tagging the Release_1_6 of the project.

Makefile

@@ -29,7 +29,7 @@ MAKE_ENV = $(TANGO_DIR)/Libraries/cppserver/common
 #
 PACKAGE_NAME = Keithley428
 MAJOR_VERS   = 1
-MINOR_VERS   = 5
+MINOR_VERS   = 6
 RELEASE      = Release_$(MAJOR_VERS)_$(MINOR_VERS)
 
 # #=============================================================================
@@ -56,7 +56,7 @@ OUTPUT_TYPE = DEVICE
 #	- $HOME/DeviceServers if OUTPUT_TYPE is DEVICE
 #	- ../bin for others
 #
-OUTPUT_DIR = ./bin/$(BIN_DIR)
+#OUTPUT_DIR = ./bin/$(BIN_DIR)
 
 
 #
@@ -82,7 +82,7 @@ INC_DIR_USER= -I . -I$(GPIB_DIR)
 #   - for a device server, tango libraries directories are automatically appended
 #   - '-L ../lib' is automatically appended in all cases
 #
-LIB_DIR_USER=
+LIB_DIR_USER= -L$(GPIB_DIR)/$(_libdir) -L$(TANGO_HOME)/$(_libdir)
 
 #=============================================================================
 # LFLAGS_USR is the list of user link flags
@@ -95,7 +95,7 @@ LIB_DIR_USER=
 # you must use '-lA -lB' in this order as link flags, otherwise you will get
 # 'undefined reference' errors
 #
-LFLAGS_USR+=  $(GPIB_DIR)/bin/libGpibDeviceServer.a  $(TANGO_HOME)/$(_libdir)/libgpib.a
+LFLAGS_USR+=  -lGpibDeviceServer -lgpib
 
 
 #=============================================================================
@@ -157,6 +157,6 @@ include $(MAKE_ENV)/common_target.opt
 
 
 libGpibDeviceServer.a:
-	@echo -e "\n >>> Making $(GPIB_DIR)/bin/libGpibDeviceServer.a \n"
+	@echo -e "\n >>> Making $(GPIB_DIR)/$(_libdir)/libGpibDeviceServer.a \n"
 	cd $(GPIB_DIR) && make  OUTPUT_TYPE=STATIC_LIB
 #PROTECTED REGION END#