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

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

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

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



Index: Makefile
===================================================================
RCS file: /cvsroot/micomt/mico/auxdir/Makefile,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** Makefile	10 Dec 2001 20:15:25 -0000	1.2
--- Makefile	23 Mar 2002 20:17:09 -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,29 ****
  # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  #
! # Send comments and/or bug reports to:
! #                mi...@in...
  #
  
  include ../MakeVars
  
- LDLIBS    = -lmico$(VERSION) $(CONFLIBS)
  LDFLAGS  := -L../orb $(LDFLAGS)
  CXXFLAGS := -I. -I../include $(CPPFLAGS) $(CXXFLAGS) $(X_CFLAGS)
  
  AUX_SRCS=dynany_impl.cc
--- 17,29 ----
  # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  #
! # For more information, visit the MICO Home Page at
! # http://www.mico.org/
  #
  
  include ../MakeVars
  
  LDFLAGS  := -L../orb $(LDFLAGS)
  CXXFLAGS := -I. -I../include $(CPPFLAGS) $(CXXFLAGS) $(X_CFLAGS)
+ LDLIBS   := $(LDMICO) $(CONFLIBS)
  
  AUX_SRCS=dynany_impl.cc
***************
*** 64,67 ****
--- 64,76 ----
  SHARED_LIBS = $(STATIC_LIBS:.a=.$(SOEXT))
  
+ # mingw hack
+ 
+ ifeq ($(OSTYPE), windows)
+ ifeq ($(HAVE_SHARED), yes)
+ HAVE_SHARED := no
+ HAVE_STATIC := yes
+ endif
+ endif
+ 
  # normal rules
  
***************
*** 100,104 ****
  	rm -f $@
  	$(LDSO) -o libmicoaux$(VERSION) $(SHARED_AUX_OBJS) \
! 		-L../libs -lmico$(VERSION)
  	$(IDIRCMD) ../libs
  	cd ../libs; rm -f $@; ln -f -s ../auxdir/$@ .
--- 109,113 ----
  	rm -f $@
  	$(LDSO) -o libmicoaux$(VERSION) $(SHARED_AUX_OBJS) \
! 		-L../libs $(LDMICO)
  	$(IDIRCMD) ../libs
  	cd ../libs; rm -f $@; ln -f -s ../auxdir/$@ .
***************
*** 106,114 ****
  libmicox$(VERSION).$(SOEXT): $(SHARED_X11_OBJS)
  ifeq ($(HAVE_REPO), yes)
! 	-$(CXX) $(CXXFLAGS) $(SHARED_X11_OBJS) $(LDFLAGS) $(LDLIBS)
  endif
  	rm -f $@
! 	$(LDSO) -o libmicox$(VERSION) $(SHARED_X11_OBJS) \
! 		$(PURE_LDFLAGS) $(X_LIBS) -lXt -lX11 -L../libs -lmico$(VERSION)
  	$(IDIRCMD) ../libs
  	cd ../libs; rm -f $@; ln -f -s ../auxdir/$@ .
--- 115,123 ----
  libmicox$(VERSION).$(SOEXT): $(SHARED_X11_OBJS)
  ifeq ($(HAVE_REPO), yes)
! 	-$(CXX) $(CXXFLAGS) $(SHARED_X11_OBJS) $(LDFLAGS) $(X_LIBS) $(LDLIBS)
  endif
  	rm -f $@
! 	$(LDSO) -o libmicox$(VERSION) $(SHARED_X11_OBJS) $(X_LIBS) \
! 		$(PURE_LDFLAGS) -lXt -lX11 -L../libs $(LDMICO)
  	$(IDIRCMD) ../libs
  	cd ../libs; rm -f $@; ln -f -s ../auxdir/$@ .
***************
*** 116,124 ****
  libmicoqt$(VERSION).$(SOEXT): $(SHARED_QT_OBJS)
  ifeq ($(HAVE_REPO), yes)
! 	-$(CXX) $(CXXFLAGS) $(SHARED_QT_OBJS) $(LDFLAGS) $(LDLIBS)
  endif
  	rm -f $@
! 	$(LDSO) -o libmicoqt$(VERSION) $(SHARED_QT_OBJS) \
! 		$(PURE_LDFLAGS) -lqt -lX11 -L../libs -lmico$(VERSION)
  	$(IDIRCMD) ../libs
  	cd ../libs; rm -f $@; ln -f -s ../auxdir/$@ .
--- 125,133 ----
  libmicoqt$(VERSION).$(SOEXT): $(SHARED_QT_OBJS)
  ifeq ($(HAVE_REPO), yes)
! 	-$(CXX) $(CXXFLAGS) $(SHARED_QT_OBJS) $(LDFLAGS) $(X_LIBS) $(LDLIBS)
  endif
  	rm -f $@
! 	$(LDSO) -o libmicoqt$(VERSION) $(SHARED_QT_OBJS) $(X_LIBS) \
! 		$(PURE_LDFLAGS) -lqt -lX11 -L../libs $(LDMICO)
  	$(IDIRCMD) ../libs
  	cd ../libs; rm -f $@; ln -f -s ../auxdir/$@ .
***************
*** 126,134 ****
  libmicogtk$(VERSION).$(SOEXT): $(SHARED_GTK_OBJS)
  ifeq ($(HAVE_REPO), yes)
! 	-$(CXX) $(CXXFLAGS) $(SHARED_GTK_OBJS) $(LDFLAGS) $(LDLIBS)
  endif
  	rm -f $@
! 	$(LDSO) -o libmicogtk$(VERSION) $(SHARED_GTK_OBJS) \
! 		$(PURE_LDFLAGS) $(GTK_LIBS) -L../libs -lmico$(VERSION)
  	$(IDIRCMD) ../libs
  	cd ../libs; rm -f $@; ln -f -s ../auxdir/$@ .
--- 135,143 ----
  libmicogtk$(VERSION).$(SOEXT): $(SHARED_GTK_OBJS)
  ifeq ($(HAVE_REPO), yes)
! 	-$(CXX) $(CXXFLAGS) $(SHARED_GTK_OBJS) $(LDFLAGS) $(X_LIBS) $(LDLIBS)
  endif
  	rm -f $@
! 	$(LDSO) -o libmicogtk$(VERSION) $(SHARED_GTK_OBJS) $(X_LIBS) \
! 		$(PURE_LDFLAGS) $(GTK_LIBS) -L../libs $(LDMICO)
  	$(IDIRCMD) ../libs
  	cd ../libs; rm -f $@; ln -f -s ../auxdir/$@ .
***************
*** 140,144 ****
  	rm -f $@
  	$(LDSO) -o libmicotcl$(VERSION) $(SHARED_TCL_OBJS) \
! 		$(PURE_LDFLAGS) $(TCL_LIBS) -L../libs -lmico$(VERSION)
  	$(IDIRCMD) ../libs
  	cd ../libs; rm -f $@; ln -f -s ../auxdir/$@ .
--- 149,153 ----
  	rm -f $@
  	$(LDSO) -o libmicotcl$(VERSION) $(SHARED_TCL_OBJS) \
! 		$(PURE_LDFLAGS) $(TCL_LIBS) -L../libs $(LDMICO)
  	$(IDIRCMD) ../libs
  	cd ../libs; rm -f $@; ln -f -s ../auxdir/$@ .
***************
*** 196,200 ****
  
  clean:
! 	-$(RM) *.o *.a *~ *.rpo *.objid *.moc *.$(SOEXT)
  	-$(RM) .depend TAGS core nohup.out
  	-$(RM) *.orig
--- 205,209 ----
  
  clean:
! 	-$(RM) *.o *.o0 *.a *~ *.$(SOEXT) *.exe *.rpo *.objid *.moc
  	-$(RM) .depend TAGS core nohup.out
  	-$(RM) *.orig