[MICO/mt-commit] CVS: mico/coss Makefile,1.2,1.3

[Karel G. <kg...@us...>]

Update of /cvsroot/micomt/mico/coss
In directory usw-pr-cvs1:/tmp/cvs-serv31844/coss

Modified Files:
	Makefile 
Log Message:
- merged with MICO 2.3.7



Index: Makefile
===================================================================
RCS file: /cvsroot/micomt/mico/coss/Makefile,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** Makefile	1 Jan 2002 20:29:21 -0000	1.2
--- Makefile	23 Mar 2002 20:17:10 -0000	1.3
***************
*** 1,5 ****
  #
! # MICO --- a free CORBA implementation
! # Copyright (C) 1997 Kay Roemer & Arno Puder
  #
  # This program is free software; you can redistribute it and/or modify
--- 1,5 ----
  #
! # MICO --- an Open Source CORBA implementation
! # Copyright (c) 1997-2002 by The Mico Team
  #
  # This program is free software; you can redistribute it and/or modify
***************
*** 17,22 ****
  # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  #
! # Send comments and/or bug reports to:
! #                mi...@in...
  #
  
--- 17,22 ----
  # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  #
! # For more information, visit the MICO Home Page at
! # http://www.mico.org/
  #
  
***************
*** 61,65 ****
  
  CLEANDIRS = naming events streams relship property trader time lifecycle externalization
! LDFLAGS := -L../orb -lmico$(VERSION) $(LDFLAGS)
  
  #STATIC_OBJS = \
--- 61,66 ----
  
  CLEANDIRS = naming events streams relship property trader time lifecycle externalization
! 
! LDLIBS    = -L../orb $(LDFLAGS) $(LDMICO) $(CONFLIBS)
  
  #STATIC_OBJS = \
***************
*** 137,144 ****
  SHARED_OBJS = $(STATIC_OBJS:.o=.pic.o)
  
  
! all: lib prg
  
  
  lib:
  
--- 138,154 ----
  SHARED_OBJS = $(STATIC_OBJS:.o=.pic.o)
  
+ # mingw hack
  
! ifeq ($(OSTYPE), windows)
! ifeq ($(HAVE_SHARED), yes)
! HAVE_SHARED_EXCEPTS := no
! HAVE_SHARED := no
! HAVE_STATIC := yes
! endif
! endif
  
  
+ all: lib prg
+ 
  lib:
  
***************
*** 173,177 ****
  	$(RM) $@
  	$(LDSO) -o libmicocoss$(VERSION) $(SHARED_OBJS) \
! 		-L../libs -lmico$(VERSION)
  	$(IDIRCMD) ../libs
  	cd ../libs; $(RM) $@; $(LN) ../coss/$@ .
--- 183,187 ----
  	$(RM) $@
  	$(LDSO) -o libmicocoss$(VERSION) $(SHARED_OBJS) \
! 		-L../libs $(LDMICO)
  	$(IDIRCMD) ../libs
  	cd ../libs; $(RM) $@; $(LN) ../coss/$@ .
***************
*** 192,196 ****
  clean:
  	for i in $(CLEANDIRS); do $(MAKE) -C $$i clean || exit 1; done
! 	$(RM) *.a *.$(SOEXT)
  
  install:
--- 202,207 ----
  clean:
  	for i in $(CLEANDIRS); do $(MAKE) -C $$i clean || exit 1; done
! 	-$(RM) *.o *.o0 *.a *~ *.$(SOEXT) *.exe *.rpo *.objid
! 	-$(RM) .depend TAGS core nohup.out
  
  install:
***************
*** 209,214 ****
  
  install-cd: install
- 
- .depend:
- 	for i in $(SUBDIRS); do $(MAKE) -C $$i .depend || exit 1; done
  
--- 220,222 ----