[Adonthell-commits] CVS: adonthell/src Makefile.am,1.80.2.37,1.80.2.38

[Kai Sterker <address@hidden>]

Update of /cvsroot/adonthell/adonthell/src
In directory subversions:/tmp/cvs-serv18083/src

Modified Files:
      Tag: Branch_road_to_0-4
        Makefile.am 
Log Message:
FIXES for autoconf 2.53 and automake 1.6


Index: Makefile.am
===================================================================
RCS file: /cvsroot/adonthell/adonthell/src/Makefile.am,v
retrieving revision 1.80.2.37
retrieving revision 1.80.2.38
diff -C2 -r1.80.2.37 -r1.80.2.38
*** Makefile.am 11 Aug 2002 20:57:45 -0000      1.80.2.37
--- Makefile.am 12 Sep 2002 20:18:16 -0000      1.80.2.38
***************
*** 18,22 ****
  EXTRA_DIST = .indent.pro prefs.l # py_adonthell.i adonthell.py
  
! CPPFLAGS += $(SDL_DEFS) $(OGG_DEFS) $(SDL_CFLAGS) $(OGG_CFLAGS) $(PY_CFLAGS) 
$(FT2_CFLAGS)
  
  noinst_LIBRARIES = libbase.a
--- 18,22 ----
  EXTRA_DIST = .indent.pro prefs.l # py_adonthell.i adonthell.py
  
! CPPFLAGS = $(SDL_DEFS) $(OGG_DEFS) $(SDL_CFLAGS) $(OGG_CFLAGS) $(PY_CFLAGS) 
$(FT2_CFLAGS)
  
  noinst_LIBRARIES = libbase.a
***************
*** 112,116 ****
  alextest_LDADD = lmap/libmap.a gfx/libgfx.a input/libinput.a 
python/libpython.a libbase.a $(libbase_LDADD) $(libpython_LDADD)
  
! pytest_LDADD = libbase.a python/libpython.a gfx/libgfx.a input/libinput.a 
$(libbase_LDADD) $(libpython_LDADD) $(libpython_LDADD)
  
  schedtest_LDADD = libbase.a python/libpython.a gfx/libgfx.a 
python/libpython.a input/libinput.a $(libbase_LDADD) $(libpython_LDADD)
--- 112,116 ----
  alextest_LDADD = lmap/libmap.a gfx/libgfx.a input/libinput.a 
python/libpython.a libbase.a $(libbase_LDADD) $(libpython_LDADD)
  
! pytest_LDADD = gfx/libgfx.a libbase.a python/libpython.a input/libinput.a 
$(libbase_LDADD) $(libpython_LDADD) $(libpython_LDADD)
  
  schedtest_LDADD = libbase.a python/libpython.a gfx/libgfx.a 
python/libpython.a input/libinput.a $(libbase_LDADD) $(libpython_LDADD)