[MICO/mt-commit] CVS: mico/demo MakeVars,1.1.1.1,1.2 MakeVars.install.in,1.2,1.3

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

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

Modified Files:
	MakeVars MakeVars.install.in 
Log Message:
- merged with MICO 2.3.7



Index: MakeVars
===================================================================
RCS file: /cvsroot/micomt/mico/demo/MakeVars,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** MakeVars	3 Nov 1999 23:20:52 -0000	1.1.1.1
--- MakeVars	23 Mar 2002 20:17:11 -0000	1.2
***************
*** 1,6 ****
  # -*- Makefile -*-
  #
! # MICO --- a CORBA 2.0 implementation
! # Copyright (C) 1997 Kay Roemer & Arno Puder
  #
  # This program is free software; you can redistribute it and/or modify
--- 1,6 ----
  # -*- Makefile -*-
  #
! # 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
***************
*** 18,23 ****
  # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  #
! # Send comments and/or bug reports to:
! #                mi...@in...
  #
  
--- 18,23 ----
  # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  #
! # For more information, visit the MICO Home Page at
! # http://www.mico.org/
  #
  
***************
*** 28,32 ****
  CXXFLAGS := -I. -I$(DIR_PREFIX)../../include $(CXXFLAGS) $(EHFLAGS)
  CFLAGS   := -I. -I$(DIR_PREFIX)../../include $(CFLAGS)
! LDLIBS   := -lmico$(VERSION) $(CONFLIBS)
  LDFLAGS  := -L$(DIR_PREFIX)../../libs $(LDFLAGS)
  DEPS     := $(DIR_PREFIX)../../orb/$(LIBMICO)
--- 28,32 ----
  CXXFLAGS := -I. -I$(DIR_PREFIX)../../include $(CXXFLAGS) $(EHFLAGS)
  CFLAGS   := -I. -I$(DIR_PREFIX)../../include $(CFLAGS)
! LDLIBS   := $(LDMICO) $(CONFLIBS)
  LDFLAGS  := -L$(DIR_PREFIX)../../libs $(LDFLAGS)
  DEPS     := $(DIR_PREFIX)../../orb/$(LIBMICO)
***************
*** 34,44 ****
  
  AUX_CXXFLAGS =
! AUX_LDLIBS   = -lmicoaux$(VERSION)
  AUX_LDFLAGS  =
! ifeq  ($(HAVE_STATIC), yes)
! AUX_DEPS     = $(DIR_PREFIX)../../auxdir/libmicoaux$(VERSION).a
! else
! AUX_DEPS     = $(DIR_PREFIX)../../auxdir/libmicoaux$(VERSION).$(SOEXT)
! endif
  
  X11_CXXFLAGS = $(X_CFLAGS)
--- 34,40 ----
  
  AUX_CXXFLAGS =
! AUX_LDLIBS   = $(LDMICOAUX)
  AUX_LDFLAGS  =
! AUX_DEPS     = $(DIR_PREFIX)../../auxdir/$(LIBMICOAUX)
  
  X11_CXXFLAGS = $(X_CFLAGS)

Index: MakeVars.install.in
===================================================================
RCS file: /cvsroot/micomt/mico/demo/MakeVars.install.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** MakeVars.install.in	6 Jul 2001 22:15:06 -0000	1.2
--- MakeVars.install.in	23 Mar 2002 20:17:11 -0000	1.3
***************
*** 1,6 ****
  # -*- Makefile -*-
  #
! # MICO --- a CORBA 2.0 implementation
! # Copyright (C) 1997 Kay Roemer & Arno Puder
  #
  # This program is free software; you can redistribute it and/or modify
--- 1,6 ----
  # -*- Makefile -*-
  #
! #  MICO --- an Open Source CORBA implementation
! #  Copyright (c) 1997-2001 by The Mico Team
  #
  # This program is free software; you can redistribute it and/or modify
***************
*** 18,23 ****
  # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  #
! # Send comments and/or bug reports to:
! #                mi...@in...
  #
  
--- 18,23 ----
  # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  #
! #  For more information, visit the MICO Home Page at
! #  http://www.mico.org/
  #