[Playerstage-commit] code/stage/libstage Makefile,1.1.2.6,1.1.2.7

[Richard V. <rt...@us...>]

Update of /cvsroot/playerstage/code/stage/libstage
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4664/libstage

Modified Files:
      Tag: opengl
	Makefile 
Log Message:
fixing up autoconf

Index: Makefile
===================================================================
RCS file: /cvsroot/playerstage/code/stage/libstage/Attic/Makefile,v
retrieving revision 1.1.2.6
retrieving revision 1.1.2.7
diff -C2 -d -r1.1.2.6 -r1.1.2.7
*** Makefile	22 Nov 2007 01:39:04 -0000	1.1.2.6
--- Makefile	22 Nov 2007 01:42:48 -0000	1.1.2.7
***************
*** 80,92 ****
  depcomp = $(SHELL) $(top_srcdir)/depcomp
  am__depfiles_maybe = depfiles
- COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
- 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
- LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
- 	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
- CCLD = $(CC)
- LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
- 	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
- 	$(LDFLAGS) -o $@
  CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
  	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
--- 80,83 ----
***************
*** 98,101 ****
--- 89,101 ----
  	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
  	$(LDFLAGS) -o $@
+ COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+ 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+ LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+ 	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+ CCLD = $(CC)
+ LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+ 	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
+ 	$(LDFLAGS) -o $@
  SOURCES = $(libstage_la_SOURCES) $(stest_SOURCES)
  DIST_SOURCES = $(libstage_la_SOURCES) $(stest_SOURCES)
***************
*** 232,237 ****
  # install the color database
  pkgdata_DATA = rgb.txt
- 
- # CC=g++
  RGB = $(datadir)/stage/rgb.txt
  
--- 232,235 ----
***************
*** 258,262 ****
  	model_ranger.cc \
  	model_props.cc \
! 	stage.c \
  	stage.hh \
  	typetable.cc \
--- 256,260 ----
  	model_ranger.cc \
  	model_props.cc \
! 	stage.cc \
  	stage.hh \
  	typetable.cc \
***************
*** 278,282 ****
  
  .SUFFIXES:
! .SUFFIXES: .c .cc .lo .o .obj
  $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
  	@for dep in $?; do \
--- 276,280 ----
  
  .SUFFIXES:
! .SUFFIXES: .cc .lo .o .obj
  $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
  	@for dep in $?; do \
***************
*** 394,418 ****
  include ./$(DEPDIR)/worldgui.Plo
  
- .c.o:
- 	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
- 	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- #	source='$<' object='$@' libtool=no \
- #	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
- #	$(COMPILE) -c $<
- 
- .c.obj:
- 	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
- 	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- #	source='$<' object='$@' libtool=no \
- #	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
- #	$(COMPILE) -c `$(CYGPATH_W) '$<'`
- 
- .c.lo:
- 	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
- 	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
- #	source='$<' object='$@' libtool=yes \
- #	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
- #	$(LTCOMPILE) -c -o $@ $<
- 
  .cc.o:
  	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
--- 392,395 ----