[aedGUI-cvs] aedGUI/test Makefile.am,1.24,1.25

[<sl...@us...>]

Update of /cvsroot/aedgui/aedGUI/test
In directory sc8-pr-cvs1:/tmp/cvs-serv16384/test

Modified Files:
	Makefile.am 
Log Message:
Don't hardcode a particular compiler in... some people cross-compile. :)


Index: Makefile.am
===================================================================
RCS file: /cvsroot/aedgui/aedGUI/test/Makefile.am,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -d -r1.24 -r1.25
*** Makefile.am	1 Oct 2003 19:52:17 -0000	1.24
--- Makefile.am	14 Nov 2003 21:14:09 -0000	1.25
***************
*** 10,47 ****
  ## bypass crappy libtool linking ...
  aedGuiTest@EXEEXT@: main.o ../src/.libs/libaedGUI.la
! 	g++ $(AM_CXXFLAGS) $< -o $@ -Wl,-rpath,../src/.libs/ \
  	-L../src/.libs/ -laedGUI @SDL_LIBS@
  
  main.o: main.cpp main.h ../include/*h
! 	g++ $(AM_CXXFLAGS) -c $< -o $@
  
  testsprite@EXEEXT@: testsprite.o ../src/.libs/libaedGUI.la
! 	g++ $(AM_CXXFLAGS) $< -o $@ -Wl,-rpath,../src/.libs/ \
  	-L../src/.libs/ -laedGUI @SDL_LIBS@
  
  testsprite.o: testsprite.cpp ../include/*h
! 	g++ $(AM_CXXFLAGS) -c $< -o $@
  
  menutest@EXEEXT@: menutest.o ../src/.libs/libaedGUI.la
! 	g++ $(AM_CXXFLAGS) $< -o $@ -Wl,-rpath,../src/.libs/ \
  	-L../src/.libs/ -laedGUI @SDL_LIBS@
  
  menutest.o: menutest.cpp ../include/*h
! 	g++ $(AM_CXXFLAGS) -c $< -o $@
  
  xmltest@EXEEXT@: xmltest.o ../src/.libs/libaedGUI.la
! 	g++ $(AM_CXXFLAGS) $< -o $@ -Wl,-rpath,../src/.libs/ \
  	-L../src/.libs/ -laedGUI @SDL_LIBS@
  
  xmltest.o: xmltest.cpp ../include/*h
! 	g++ $(AM_CXXFLAGS) -c $< -o $@
  
  gltest@EXEEXT@: gltest.o ../src/.libs/libaedGUI.la
! 	g++ $(AM_CXXFLAGS) gltest.o -o gltest@EXEEXT@ \
  	-Wl,-rpath,../src/.libs/ \
  	-L../src/.libs/ -laedGUI @SDL_LIBS@ @GL_LIBS@
  
  gltest.o: gltest.cpp
! 	g++ $(AM_CXXFLAGS) -c gltest.cpp -o gltest.o
  
  EXTRA_DIST = xmltest.cpp test1.xml menutest.cpp main.cpp main.h testsprite.cpp test.bmp Vera.ttf font.h icon.bmp gltest.cpp
--- 10,47 ----
  ## bypass crappy libtool linking ...
  aedGuiTest@EXEEXT@: main.o ../src/.libs/libaedGUI.la
! 	$(CXX) $(AM_CXXFLAGS) $< -o $@ -Wl,-rpath,../src/.libs/ \
  	-L../src/.libs/ -laedGUI @SDL_LIBS@
  
  main.o: main.cpp main.h ../include/*h
! 	$(CXX) $(AM_CXXFLAGS) -c $< -o $@
  
  testsprite@EXEEXT@: testsprite.o ../src/.libs/libaedGUI.la
! 	$(CXX) $(AM_CXXFLAGS) $< -o $@ -Wl,-rpath,../src/.libs/ \
  	-L../src/.libs/ -laedGUI @SDL_LIBS@
  
  testsprite.o: testsprite.cpp ../include/*h
! 	$(CXX) $(AM_CXXFLAGS) -c $< -o $@
  
  menutest@EXEEXT@: menutest.o ../src/.libs/libaedGUI.la
! 	$(CXX) $(AM_CXXFLAGS) $< -o $@ -Wl,-rpath,../src/.libs/ \
  	-L../src/.libs/ -laedGUI @SDL_LIBS@
  
  menutest.o: menutest.cpp ../include/*h
! 	$(CXX) $(AM_CXXFLAGS) -c $< -o $@
  
  xmltest@EXEEXT@: xmltest.o ../src/.libs/libaedGUI.la
! 	$(CXX) $(AM_CXXFLAGS) $< -o $@ -Wl,-rpath,../src/.libs/ \
  	-L../src/.libs/ -laedGUI @SDL_LIBS@
  
  xmltest.o: xmltest.cpp ../include/*h
! 	$(CXX) $(AM_CXXFLAGS) -c $< -o $@
  
  gltest@EXEEXT@: gltest.o ../src/.libs/libaedGUI.la
! 	$(CXX) $(AM_CXXFLAGS) gltest.o -o gltest@EXEEXT@ \
  	-Wl,-rpath,../src/.libs/ \
  	-L../src/.libs/ -laedGUI @SDL_LIBS@ @GL_LIBS@
  
  gltest.o: gltest.cpp
! 	$(CXX) $(AM_CXXFLAGS) -c gltest.cpp -o gltest.o
  
  EXTRA_DIST = xmltest.cpp test1.xml menutest.cpp main.cpp main.h testsprite.cpp test.bmp Vera.ttf font.h icon.bmp gltest.cpp