[Cbar-develop] cbar/misc makefile.bcc,1.5,1.6 makefile.mgw,1.6,1.7

[Rasmus M. <ras...@us...>]

Update of /cvsroot/cbar/cbar/misc
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10086

Modified Files:
	makefile.bcc makefile.mgw 
Log Message:
Fixed target name

Index: makefile.mgw
===================================================================
RCS file: /cvsroot/cbar/cbar/misc/makefile.mgw,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** makefile.mgw	23 May 2004 20:45:05 -0000	1.6
--- makefile.mgw	23 May 2004 23:07:00 -0000	1.7
***************
*** 36,50 ****
  
  ifdef STATICLINK # link as a static library
!  OBJ_DIR = $(OBJ_PLATFORM_ROOT_DIR)/$(PACKAGE5)_s
!  OBJ_DIR_D = $(OBJ_PLATFORM_ROOT_DIR_D)\$(PACKAGE5)_s
!  IMPLIB_BASENAME = lib$(PACKAGE5)_s.a
   IMPLIB_NAME = $(LIB_DIR)/$(IMPLIB_BASENAME)
   LIB_NAME = $(IMPLIB_NAME)
  else # link as a DLL
!  OBJ_DIR = $(OBJ_PLATFORM_ROOT_DIR)/$(PACKAGE5)
!  OBJ_DIR_D = $(OBJ_PLATFORM_ROOT_DIR_D)\$(PACKAGE5)
!  DLL_BASENAME = $(PACKAGE4)$(LIB_VERSION).dll
   DLL_NAME = $(LIB_DIR)/$(DLL_BASENAME)
!  IMPLIB_BASENAME = lib$(PACKAGE5).a
   IMPLIB_NAME = $(LIB_DIR)/$(IMPLIB_BASENAME)
   EXPDEF_NAME = $(LIB_DIR)/cbar.def
--- 36,50 ----
  
  ifdef STATICLINK # link as a static library
!  OBJ_DIR = $(OBJ_PLATFORM_ROOT_DIR)/$(PACKAGE)_s
!  OBJ_DIR_D = $(OBJ_PLATFORM_ROOT_DIR_D)\$(PACKAGE)_s
!  IMPLIB_BASENAME = lib$(PACKAGE)_s.a
   IMPLIB_NAME = $(LIB_DIR)/$(IMPLIB_BASENAME)
   LIB_NAME = $(IMPLIB_NAME)
  else # link as a DLL
!  OBJ_DIR = $(OBJ_PLATFORM_ROOT_DIR)/$(PACKAGE)
!  OBJ_DIR_D = $(OBJ_PLATFORM_ROOT_DIR_D)\$(PACKAGE)
!  DLL_BASENAME = $(PACKAGE)$(LIB_VERSION).dll
   DLL_NAME = $(LIB_DIR)/$(DLL_BASENAME)
!  IMPLIB_BASENAME = lib$(PACKAGE).a
   IMPLIB_NAME = $(LIB_DIR)/$(IMPLIB_BASENAME)
   EXPDEF_NAME = $(LIB_DIR)/cbar.def

Index: makefile.bcc
===================================================================
RCS file: /cvsroot/cbar/cbar/misc/makefile.bcc,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** makefile.bcc	8 Feb 2004 11:34:11 -0000	1.5
--- makefile.bcc	23 May 2004 23:07:00 -0000	1.6
***************
*** 62,76 ****
   # link as a static library
   OBJ_DIR = $(OBJ_PLATFORM_ROOT_DIR)/$(PACKAGE5)_s
!  OBJ_DIR_D = $(OBJ_PLATFORM_ROOT_DIR_D)\$(PACKAGE5)_s
!  IMPLIB_BASENAME = $(PACKAGE5)_s$(LIB_SUFFIX)
   IMPLIB_NAME = $(LIB_DIR)/$(IMPLIB_BASENAME)
   LIB_NAME = $(IMPLIB_NAME)
  else
   # link as a DLL
!  OBJ_DIR = $(OBJ_PLATFORM_ROOT_DIR)/$(PACKAGE5)
!  OBJ_DIR_D = $(OBJ_PLATFORM_ROOT_DIR_D)\$(PACKAGE5)
!  DLL_BASENAME = $(PACKAGE4)$(LIB_VERSION).dll
   DLL_NAME = $(LIB_DIR)/$(DLL_BASENAME)
!  IMPLIB_BASENAME = $(PACKAGE4)$(LIB_SUFFIX)
   IMPLIB_NAME = $(LIB_DIR)/$(IMPLIB_BASENAME)
   LIB_NAME = $(DLL_NAME) $(IMPLIB_NAME)
--- 62,76 ----
   # link as a static library
   OBJ_DIR = $(OBJ_PLATFORM_ROOT_DIR)/$(PACKAGE5)_s
!  OBJ_DIR_D = $(OBJ_PLATFORM_ROOT_DIR_D)\$(PACKAGE)_s
!  IMPLIB_BASENAME = $(PACKAGE)_s$(LIB_SUFFIX)
   IMPLIB_NAME = $(LIB_DIR)/$(IMPLIB_BASENAME)
   LIB_NAME = $(IMPLIB_NAME)
  else
   # link as a DLL
!  OBJ_DIR = $(OBJ_PLATFORM_ROOT_DIR)/$(PACKAGE)
!  OBJ_DIR_D = $(OBJ_PLATFORM_ROOT_DIR_D)\$(PACKAGE)
!  DLL_BASENAME = $(PACKAGE)$(LIB_VERSION).dll
   DLL_NAME = $(LIB_DIR)/$(DLL_BASENAME)
!  IMPLIB_BASENAME = $(PACKAGE)$(LIB_SUFFIX)
   IMPLIB_NAME = $(LIB_DIR)/$(IMPLIB_BASENAME)
   LIB_NAME = $(DLL_NAME) $(IMPLIB_NAME)