[Benson-commit] CVS: benson2/src/corba Makefile.in,1.4,1.5

[Bob T. <bt...@us...>]

Update of /cvsroot/benson/benson2/src/corba
In directory usw-pr-cvs1:/tmp/cvs-serv13579/src/corba

Modified Files:
	Makefile.in 
Log Message:
Several changes to the build environment

Index: Makefile.in
===================================================================
RCS file: /cvsroot/benson/benson2/src/corba/Makefile.in,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** Makefile.in	2001/05/29 05:05:15	1.4
--- Makefile.in	2001/06/03 23:33:40	1.5
***************
*** 64,77 ****
  CXX = @CXX@
  DLLTOOL = @DLLTOOL@
  HAVE_X11 = @HAVE_X11@
- LD = @LD@
  LIBTOOL = @LIBTOOL@
  LIBTOOL_VERSION = @LIBTOOL_VERSION@
  LN_S = @LN_S@
  MAKEINFO = @MAKEINFO@
- NM = @NM@
  OBJDUMP = @OBJDUMP@
  PACKAGE = @PACKAGE@
  RANLIB = @RANLIB@
  VERSION = @VERSION@
  idl = @idl@
--- 64,79 ----
  CXX = @CXX@
  DLLTOOL = @DLLTOOL@
+ ECHO = @ECHO@
+ EXEEXT = @EXEEXT@
  HAVE_X11 = @HAVE_X11@
  LIBTOOL = @LIBTOOL@
  LIBTOOL_VERSION = @LIBTOOL_VERSION@
  LN_S = @LN_S@
  MAKEINFO = @MAKEINFO@
  OBJDUMP = @OBJDUMP@
+ OBJEXT = @OBJEXT@
  PACKAGE = @PACKAGE@
  RANLIB = @RANLIB@
+ STRIP = @STRIP@
  VERSION = @VERSION@
  idl = @idl@
***************
*** 101,107 ****
  X_PRE_LIBS = @X_PRE_LIBS@
  libserver_a_LIBADD = 
! libserver_a_OBJECTS =  Trap.o Queue_impl.o
  libclient_a_LIBADD = 
! libclient_a_OBJECTS =  Trap.o Queue_util.o
  AR = ar
  CXXFLAGS = @CXXFLAGS@
--- 103,109 ----
  X_PRE_LIBS = @X_PRE_LIBS@
  libserver_a_LIBADD = 
! libserver_a_OBJECTS =  Trap.$(OBJEXT) Queue_impl.$(OBJEXT)
  libclient_a_LIBADD = 
! libclient_a_OBJECTS =  Trap.$(OBJEXT) Queue_util.$(OBJEXT)
  AR = ar
  CXXFLAGS = @CXXFLAGS@
***************
*** 123,127 ****
  all: all-redirect
  .SUFFIXES:
! .SUFFIXES: .S .c .cc .lo .o .s
  $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
  	cd $(top_srcdir) && $(AUTOMAKE) --gnu src/corba/Makefile
--- 125,129 ----
  all: all-redirect
  .SUFFIXES:
! .SUFFIXES: .S .c .cc .lo .o .obj .s
  $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
  	cd $(top_srcdir) && $(AUTOMAKE) --gnu src/corba/Makefile
***************
*** 141,144 ****
--- 143,151 ----
  maintainer-clean-noinstLIBRARIES:
  
+ # FIXME: We should only use cygpath when building on Windows,
+ # and only if it is available.
+ .c.obj:
+ 	$(COMPILE) -c `cygpath -w $<`
+ 
  .s.o:
  	$(COMPILE) -c $<
***************
*** 149,152 ****
--- 156,160 ----
  mostlyclean-compile:
  	-rm -f *.o core *.core
+ 	-rm -f *.$(OBJEXT)
  
  clean-compile:
***************
*** 184,187 ****
--- 192,197 ----
  .cc.o:
  	$(CXXCOMPILE) -c $<
+ .cc.obj:
+ 	$(CXXCOMPILE) -c `cygpath -w $<`
  .cc.lo:
  	$(LTCXXCOMPILE) -c $<