[Adonthell-commits] CVS: adonthell/src/gfx Makefile.am,1.1.2.1,1.1.2.2

[Alexandre Courbot <address@hidden>]

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

Modified Files:
      Tag: Branch_road_to_0-4
        Makefile.am 
Log Message:
UPDATED map engine specifications
ADDED Python callback functionality to the input system
RE-ENABLED (at least a little bit) the Python wrappers


Index: Makefile.am
===================================================================
RCS file: /cvsroot/adonthell/adonthell/src/gfx/Attic/Makefile.am,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -r1.1.2.1 -r1.1.2.2
*** Makefile.am 30 Jun 2002 19:01:00 -0000      1.1.2.1
--- Makefile.am 11 Aug 2002 20:57:45 -0000      1.1.2.2
***************
*** 3,10 ****
  noinst_LIBRARIES = libgfx.a
  
  libgfx_a_SOURCES = drawable.cc drawing_area.cc screen.cc surface.cc pnm.cc \
        image.cc animation.cc py_gfx_wrap.cc \
!       drawable.h drawing_area.h screen.h surface.h pnm.h image.h \
!       animation.h
  
  CPPFLAGS += -I$(srcdir)/.. $(SDL_DEFS) $(SDL_CFLAGS) $(PY_CFLAGS)
--- 3,12 ----
  noinst_LIBRARIES = libgfx.a
  
+ headers = drawable.h drawing_area.h screen.h surface.h pnm.h image.h \
+       animation.h
+ 
  libgfx_a_SOURCES = drawable.cc drawing_area.cc screen.cc surface.cc pnm.cc \
        image.cc animation.cc py_gfx_wrap.cc \
!       $(headers)
  
  CPPFLAGS += -I$(srcdir)/.. $(SDL_DEFS) $(SDL_CFLAGS) $(PY_CFLAGS)
***************
*** 13,24 ****
  
  # Note: .py files are also built by this target.
! #py_%_wrap.cc: py_%.i
! #     @if test "${P_SWIG}"; then \
! #        ${P_SWIG} -python -shadow ${SWIGFLAGS} -c++ -make_default -o 
py_$*_wrap.cc $<; \
! #     else \
! #        echo "You need swig >= $SWIG_MINVER in order to re-build this 
file."; \
! #        exit 1; \
! #     fi;
! 
! py_gfx_wrap.cc:
!       touch py_gfx_wrap.cc
--- 15,23 ----
  
  # Note: .py files are also built by this target.
! py_%_wrap.cc: py_%.i $(headers)
!       @if test "${P_SWIG}"; then \
!          ${P_SWIG} -python -shadow ${SWIGFLAGS} -c++ -make_default -o 
py_$*_wrap.cc $<; \
!       else \
!          echo "You need swig >= $SWIG_MINVER in order to re-build this 
file."; \
!          exit 1; \
!       fi;