[simspark-cvs] simspark/spark/kerosin Makefile.am,1.6,1.6.2.1

[Oliver O. <fr...@us...>]

Update of /cvsroot/simspark/simspark/spark/kerosin
In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv23675

Modified Files:
      Tag: WIN32
	Makefile.am 
Log Message:
- removed the glextensionreg stuff from Makefile
- made LIBADDs dependend on the variables from configure script


Index: Makefile.am
===================================================================
RCS file: /cvsroot/simspark/simspark/spark/kerosin/Makefile.am,v
retrieving revision 1.6
retrieving revision 1.6.2.1
diff -C2 -d -r1.6 -r1.6.2.1
*** Makefile.am	8 Mar 2006 17:00:17 -0000	1.6
--- Makefile.am	28 Feb 2007 04:44:07 -0000	1.6.2.1
***************
*** 3,16 ****
  pkglib_LTLIBRARIES = libkerosin_debug.la
  libkerosin_debug_la_SOURCES = $(sources) 
! nodist_libkerosin_debug_la_SOURCES = openglserver/glextensionreg.cpp
  libkerosin_debug_la_CXXFLAGS = -O -g -W -Wall
! libkerosin_debug_la_LIBADD = @FREETYPE_LIBADD@ -lSDL @IL_LIBADD@ -lGL 
  libkerosin_debug_la_LDFLAGS = -version-info @kerosin_version_info@
  else
  pkglib_LTLIBRARIES = libkerosin.la
  libkerosin_la_SOURCES = $(sources) 
! nodist_libkerosin_la_SOURCES = openglserver/glextensionreg.cpp
  libkerosin_la_CXXFLAGS = -O2
! libkerosin_la_LIBADD = @FREETYPE_LIBADD@ -lSDL @IL_LIBADD@ -lGL 
  libkerosin_la_LDFLAGS = -version-info @kerosin_version_info@
  endif
--- 3,16 ----
  pkglib_LTLIBRARIES = libkerosin_debug.la
  libkerosin_debug_la_SOURCES = $(sources) 
! # nodist_libkerosin_debug_la_SOURCES = openglserver/glextensionreg.cpp
  libkerosin_debug_la_CXXFLAGS = -O -g -W -Wall
! libkerosin_debug_la_LIBADD = @FREETYPE_LIBADD@ @SDL_LIBADD@ @IL_LIBADD@ @GL_LIBADD@
  libkerosin_debug_la_LDFLAGS = -version-info @kerosin_version_info@
  else
  pkglib_LTLIBRARIES = libkerosin.la
  libkerosin_la_SOURCES = $(sources) 
! # nodist_libkerosin_la_SOURCES = openglserver/glextensionreg.cpp
  libkerosin_la_CXXFLAGS = -O2
! libkerosin_la_LIBADD = @FREETYPE_LIBADD@ @SDL_LIBADD@ @IL_LIBADD@ @GL_LIBADD@
  libkerosin_la_LDFLAGS = -version-info @kerosin_version_info@
  endif
***************
*** 18,33 ****
  bin_SCRIPTS = kerosin-config
  
! BUILT_SOURCES = openglserver/glextensionreg.h
! nobase_nodist_libpkginclude_HEADERS = openglserver/glextensionreg.h
  
! openglserver/glextensionreg.cpp: ${top_srcdir}/utility/glextgen/glextensionreg.cpp
! 	@echo "Copying generated glextension sources"
! 	cp ${top_srcdir}/utility/glextgen/glextensionreg.cpp $@
  
! openglserver/glextensionreg.h: ${top_srcdir}/utility/glextgen/glextensionreg.h
! 	cp ${top_srcdir}/utility/glextgen/glextensionreg.h $@
  
! ${top_srcdir}/utility/glextgen/glextensionreg.cpp ${top_srcdir}/utility/glextgen/glextensionreg.h:
! 	cd ${top_srcdir}/utility/glextgen/ && $(MAKE) $(AM_MAKEFLAGS) all
  endif
  
--- 18,33 ----
  bin_SCRIPTS = kerosin-config
  
! # BUILT_SOURCES = openglserver/glextensionreg.h
! # nobase_nodist_libpkginclude_HEADERS = openglserver/glextensionreg.h
  
! # openglserver/glextensionreg.cpp: ${top_srcdir}/utility/glextgen/glextensionreg.cpp
! # 	@echo "Copying generated glextension sources"
! # 	cp ${top_srcdir}/utility/glextgen/glextensionreg.cpp $@
  
! # openglserver/glextensionreg.h: ${top_srcdir}/utility/glextgen/glextensionreg.h
! # 	cp ${top_srcdir}/utility/glextgen/glextensionreg.h $@
  
! # ${top_srcdir}/utility/glextgen/glextensionreg.cpp ${top_srcdir}/utility/glextgen/glextensionreg.h:
! # 	cd ${top_srcdir}/utility/glextgen/ && $(MAKE) $(AM_MAKEFLAGS) all
  endif