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

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

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

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

Index: Makefile.in
===================================================================
RCS file: /cvsroot/benson/benson2/src/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@
***************
*** 99,102 ****
--- 101,106 ----
  CONFIG_HEADER = ../config.h
  CONFIG_CLEAN_FILES = 
+ bin_PROGRAMS =  btrap$(EXEEXT) alertlist$(EXEEXT) ack$(EXEEXT)
+ sbin_PROGRAMS =  bensond$(EXEEXT)
  PROGRAMS =  $(bin_PROGRAMS) $(sbin_PROGRAMS)
  
***************
*** 108,121 ****
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
  X_PRE_LIBS = @X_PRE_LIBS@
! btrap_OBJECTS =  trap.o
  btrap_DEPENDENCIES =  corba/libclient.a perl/libperl.a
  btrap_LDFLAGS = 
! alertlist_OBJECTS =  alertlist.o
  alertlist_DEPENDENCIES =  corba/libclient.a perl/libperl.a
  alertlist_LDFLAGS = 
! ack_OBJECTS =  ack.o
  ack_DEPENDENCIES =  corba/libclient.a perl/libperl.a
  ack_LDFLAGS = 
! bensond_OBJECTS =  bensond.o
  bensond_DEPENDENCIES =  corba/libserver.a perl/libperl.a
  bensond_LDFLAGS = 
--- 112,125 ----
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
  X_PRE_LIBS = @X_PRE_LIBS@
! btrap_OBJECTS =  trap.$(OBJEXT)
  btrap_DEPENDENCIES =  corba/libclient.a perl/libperl.a
  btrap_LDFLAGS = 
! alertlist_OBJECTS =  alertlist.$(OBJEXT)
  alertlist_DEPENDENCIES =  corba/libclient.a perl/libperl.a
  alertlist_LDFLAGS = 
! ack_OBJECTS =  ack.$(OBJEXT)
  ack_DEPENDENCIES =  corba/libclient.a perl/libperl.a
  ack_LDFLAGS = 
! bensond_OBJECTS =  bensond.$(OBJEXT)
  bensond_DEPENDENCIES =  corba/libserver.a perl/libperl.a
  bensond_LDFLAGS = 
***************
*** 138,142 ****
  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/Makefile
--- 142,146 ----
  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/Makefile
***************
*** 197,200 ****
--- 201,209 ----
  	done
  
+ # 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 $<
***************
*** 205,208 ****
--- 214,218 ----
  mostlyclean-compile:
  	-rm -f *.o core *.core
+ 	-rm -f *.$(OBJEXT)
  
  clean-compile:
***************
*** 229,249 ****
  maintainer-clean-libtool:
  
! btrap: $(btrap_OBJECTS) $(btrap_DEPENDENCIES)
! 	@rm -f btrap
  	$(CXXLINK) $(btrap_LDFLAGS) $(btrap_OBJECTS) $(btrap_LDADD) $(LIBS)
  
! alertlist: $(alertlist_OBJECTS) $(alertlist_DEPENDENCIES)
! 	@rm -f alertlist
  	$(CXXLINK) $(alertlist_LDFLAGS) $(alertlist_OBJECTS) $(alertlist_LDADD) $(LIBS)
  
! ack: $(ack_OBJECTS) $(ack_DEPENDENCIES)
! 	@rm -f ack
  	$(CXXLINK) $(ack_LDFLAGS) $(ack_OBJECTS) $(ack_LDADD) $(LIBS)
  
! bensond: $(bensond_OBJECTS) $(bensond_DEPENDENCIES)
! 	@rm -f bensond
  	$(CXXLINK) $(bensond_LDFLAGS) $(bensond_OBJECTS) $(bensond_LDADD) $(LIBS)
  .cc.o:
  	$(CXXCOMPILE) -c $<
  .cc.lo:
  	$(LTCXXCOMPILE) -c $<
--- 239,261 ----
  maintainer-clean-libtool:
  
! btrap$(EXEEXT): $(btrap_OBJECTS) $(btrap_DEPENDENCIES)
! 	@rm -f btrap$(EXEEXT)
  	$(CXXLINK) $(btrap_LDFLAGS) $(btrap_OBJECTS) $(btrap_LDADD) $(LIBS)
  
! alertlist$(EXEEXT): $(alertlist_OBJECTS) $(alertlist_DEPENDENCIES)
! 	@rm -f alertlist$(EXEEXT)
  	$(CXXLINK) $(alertlist_LDFLAGS) $(alertlist_OBJECTS) $(alertlist_LDADD) $(LIBS)
  
! ack$(EXEEXT): $(ack_OBJECTS) $(ack_DEPENDENCIES)
! 	@rm -f ack$(EXEEXT)
  	$(CXXLINK) $(ack_LDFLAGS) $(ack_OBJECTS) $(ack_LDADD) $(LIBS)
  
! bensond$(EXEEXT): $(bensond_OBJECTS) $(bensond_DEPENDENCIES)
! 	@rm -f bensond$(EXEEXT)
  	$(CXXLINK) $(bensond_LDFLAGS) $(bensond_OBJECTS) $(bensond_LDADD) $(LIBS)
  .cc.o:
  	$(CXXCOMPILE) -c $<
+ .cc.obj:
+ 	$(CXXCOMPILE) -c `cygpath -w $<`
  .cc.lo:
  	$(LTCXXCOMPILE) -c $<