[Vapor-cvs] vapor/make/config base.mk,1.37,1.38

[clynejp <cl...@us...>]

Update of /cvsroot/vapor/vapor/make/config
In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv5185

Modified Files:
	base.mk 
Log Message:

Minor changes to the build system aimed at helping resolve shared library
name conflicts



Index: base.mk
===================================================================
RCS file: /cvsroot/vapor/vapor/make/config/base.mk,v
retrieving revision 1.37
retrieving revision 1.38
diff -C2 -d -r1.37 -r1.38
*** base.mk	19 May 2009 18:49:21 -0000	1.37
--- base.mk	21 May 2009 19:03:10 -0000	1.38
***************
*** 153,158 ****
  ifdef SHARED
  	LIB_LINKERNAME = $(LIBPREFIX)$(LIBRARY)$(DLLSUFFIX)
! 	LIB_SONAME = $(LIB_LINKERNAME).$(VERSION_MAJOR)
! 	LIB_REALNAME = $(LIB_SONAME).$(VERSION_MINOR).$(VERSION_RELEASE)
  	LIB_TARGET := $(addprefix $(DSO_DIR)/, $(LIB_REALNAME))
  else
--- 153,158 ----
  ifdef SHARED
  	LIB_LINKERNAME = $(LIBPREFIX)$(LIBRARY)$(DLLSUFFIX)
! 	LIB_SONAME = $(LIB_LINKERNAME).$(VERSION_MAJOR).$(VERSION_MINOR).$(VERSION_RELEASE)
! 	LIB_REALNAME = $(LIB_SONAME)
  	LIB_TARGET := $(addprefix $(DSO_DIR)/, $(LIB_REALNAME))
  else
***************
*** 197,209 ****
  
  
- PRINT_COMMAND := lpr
- 
- 
- ifdef LESSWARN
- WARN_STRING = (NOWARN)
- else
- CFLAGS += $(FULLWARN)
- endif
- 
  ifeq ($(RELEASE), 1)
  CFLAGS += $(C_RELEASE_FLAGS)
--- 197,200 ----
***************
*** 249,253 ****
  ifdef WINDOWS
  LDFLAGS += /incremental:no 
- #LDFLAGS += /pdb:none
  ifeq ($(RELEASE), 0)
  LDFLAGS += /debug
--- 240,243 ----
***************
*** 329,336 ****
  
  ifdef WINDOWS
- #LIBRARIES := $(foreach lib,$(LIBRARIES),$(TOP)/targets/$(PLATFORM)/bin/$(LIBPREFIX)$(lib)$(LIBSUFFIX))
  LIBRARIES := $(foreach lib,$(LIBRARIES),$(lib)$(LIBSUFFIX))
  LIBRARIES += $(foreach lib,$(PERSONAL_LIBRARIES),$(TOP)/targets/$(PLATFORM)/lib/$(LIBPREFIX)$(SHORT_TARGET_NAME)_$(lib)_copy$(LIBSUFFIX))
- #LIBRARIES := $(LIBRARIES:$(DLLSUFFIX)=$(LIBSUFFIX))
  STATICLIBRARIES :=
  
--- 319,324 ----
***************
*** 342,346 ****
  LIBRARIES := $(foreach lib,$(LIBRARIES),-l$(lib))
  LIBRARIES += $(foreach lib,$(PERSONAL_LIBRARIES),-l$(SHORT_TARGET_NAME)_$(lib)_copy)
- P_LIB_FILES := $(foreach lib,$(PERSONAL_LIBRARIES),$(TOP)/lib/$(PLATFORM)/$(LIBPREFIX)$(SHORT_TARGET_NAME)_$(lib)_copy$(DLLSUFFIX) )
  
  LDFLAGS += -L$(DSO_DIR) 
--- 330,333 ----
***************
*** 399,405 ****
  else
  ifdef BINUTIL_LINK_HACK
- ifdef PERSONAL_LIBRARIES
- 	@$(PERL) $(TOP)/buildutils/trans_undef_symbols.pl $(PROGRAM) $(TOP)/built/$(PROGRAM)/$(PLATFORM) $(P_LIB_FILES)
- endif
  endif
  	$(CR_CXX) $(OBJS) -o $(PROG_TARGET)$(EXESUFFIX) $(LDFLAGS) $(LIBRARIES)
--- 386,389 ----
***************
*** 419,430 ****
  else #windows
  ifdef SHARED
- ifdef BINUTIL_LINK_HACK
- ifdef PERSONAL_LIBRARIES
- 	@$(PERL) $(TOP)/buildutils/trans_undef_symbols.pl $(SHORT_TARGET_NAME) $(TOP)/built/$(SHORT_TARGET_NAME)/$(PLATFORM) $(P_LIB_FILES)
- endif
- endif
  	$(LD) $(SHARED_LDFLAGS) -o $(LIB_TARGET) $(OBJS) $(LDFLAGS) $(LIBRARIES)
  	cd $(DSO_DIR); $(RM) $(LIB_LINKERNAME); $(LN) $(LIB_REALNAME) $(LIB_LINKERNAME)
- 	cd $(DSO_DIR); $(RM) $(LIB_SONAME); $(LN) $(LIB_REALNAME) $(LIB_SONAME)
  else #shared
  	$(AR) $(ARCREATEFLAGS) $@ $(OBJS)
--- 403,408 ----
***************
*** 631,635 ****
  ifdef SHARED
  	cd $(INSTALL_LIBDIR); $(RM) $(LIB_LINKERNAME); $(LN) $(LIB_REALNAME) $(LIB_LINKERNAME)
! 	cd $(INSTALL_LIBDIR); $(RM) $(LIB_SONAME); $(LN) $(LIB_REALNAME) $(LIB_SONAME)
  endif #SHARED
  install-dep:: install
--- 609,613 ----
  ifdef SHARED
  	cd $(INSTALL_LIBDIR); $(RM) $(LIB_LINKERNAME); $(LN) $(LIB_REALNAME) $(LIB_LINKERNAME)
! #	cd $(INSTALL_LIBDIR); $(RM) $(LIB_SONAME); $(LN) $(LIB_REALNAME) $(LIB_SONAME)
  endif #SHARED
  install-dep:: install