* Correction de la cible clean par C. Mertz

	* Int�gration de libtess comme sous composant �
	  la place de libGLU
        * Ajout d'une cible pour fabriquer le module Python

1 files changed, 29 insertions, 18 deletions

diff --git a/Makefile.in b/Makefile.in
index ddffd8a..3773fea 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -44,14 +44,18 @@ LDFLAGS = -L. @LDFLAGS@ @X_LIBS@ @LOCAL_X_LIBS@
 # on some systems.
 SHARED_LIB_CFLAGS = @sharedlib_cflags@
 SHARED_TK_LDFLAGS = @sharedlib_buildflags@
-TCL_TK_VER = 8.3
-TK_INCLUDE_PATH=/usr/include/tcl$(TCL_TK_VER)
+#
+# For memory debugging
+#TCL_TK_DEBUG_SUFFIX=g
+TCL_TK_DEBUG_SUFFIX=
+TCL_TK_VER = 8.4$(TCL_TK_DEBUG_SUFFIX)
+TK_INCLUDE_PATH=/usr/local/include
 SHARED_TK_LIBS = @X_LIBS@ @LOCAL_X_LIBS@ @XMU@ -lXext -lX11 @X_EXTRA_LIBS@ -lm
 ZINC_VER = @ZINC_VER@
 ZINC_MAJOR = @ZINC_MAJOR@
 CFLAGS = -Wall $(SHARED_LIB_CFLAGS)
 CPPFLAGS =  @DEFS@ @X_CFLAGS@ $(DFLAGS) -I$(srcdir) -DBUILD_LIBRARY
-TKCFLAGS = -I$(TK_INCLUDE_PATH)
+TKCFLAGS = -I$(TK_INCLUDE_PATH) -DUSE_TCL_STUBS -DUSE_TK_STUBS
 #
 # Linux
 #PTKLIB = /usr/lib/perl5/i386-linux/5.004/Tk/pTk
@@ -66,11 +70,9 @@ PTKLIB = @TKLIB@/pTk
 PTKCFLAGS = -DPTK -I$(PTKLIB)
 #
 # Define this to use OpenGL
-# libGLU is needed even if GL support is disabled
-# the GLU tesselator replace GPC.
 #
-GLX=-lGLU -lGL -lpthread
-#GLX=-lGLU
+GLX=-lGL -lpthread
+#GLX=
 
 #
 # Recognized compilation time flags are :
@@ -154,27 +156,34 @@ Perl/Makefile_debug:
 	(cd Perl; perl Makefile.PL ptkzinc_debug$(ZINC_VER).$(ZINC_MAJOR) $(PERLCONFIG))
 	(cd Perl/debug; perl Makefile.PL $(PERLCONFIG))
 
-libptkzinc$(ZINC_VER).$(ZINC_MAJOR).so: ptk $(ptkobjs) libom.so
-	$(CC) $(SHARED_TK_LDFLAGS) -o $@ $(ptkobjs) $(SHARED_TK_LIBS) -L. -lom $(GLX) 
-libptkzinc_debug$(ZINC_VER).$(ZINC_MAJOR).so: ptk $(ptkgobjs) libom_debug.so
-	$(CC) $(SHARED_TK_LDFLAGS) -o $@ $(ptkgobjs) $(SHARED_TK_LIBS)  -L. -lom_debug $(GLX)
+libptkzinc$(ZINC_VER).$(ZINC_MAJOR).so: libtess/libtess.a ptk $(ptkobjs) libom.so
+	$(CC) $(SHARED_TK_LDFLAGS) -o $@ $(ptkobjs) $(SHARED_TK_LIBS) -L. -lom libtess/libtess.a $(GLX) 
+libptkzinc_debug$(ZINC_VER).$(ZINC_MAJOR).so: libtess/libtess.a ptk $(ptkgobjs) libom_debug.so
+	$(CC) $(SHARED_TK_LDFLAGS) -o $@ $(ptkgobjs) $(SHARED_TK_LIBS)  -L. -lom_debug libtess/libtess.a $(GLX)
 
-tkzinc: tkzinc$(ZINC_VER).$(ZINC_MAJOR).so
+tkzinc: libtess/libtess.a libtess/libtess.a tkzinc$(ZINC_VER).$(ZINC_MAJOR).so
 tkzinc$(ZINC_VER).$(ZINC_MAJOR).so: tk $(tkobjs) libom.so
-	$(CC) $(SHARED_TK_LDFLAGS) -o $@ $(SHARED_TK_LIBS) -L. -ltk$(TCL_TK_VER) -ltcl$(TCL_TK_VER) -lom $(GLX) $(tkobjs)
-tkzinc_debug: tkzinc_debug$(ZINC_VER).$(ZINC_MAJOR).so
-tkzinc_debug$(ZINC_VER).$(ZINC_MAJOR).so: tk $(tkgobjs) libom_debug.so
-	$(CC) $(SHARED_TK_LDFLAGS) -o $@ $(SHARED_TK_LIBS) -L.  -ltk$(TCL_TK_VER) -ltcl$(TCL_TK_VER) -lom_debug $(GLX) $(tkgobjs)
+	$(CC) $(SHARED_TK_LDFLAGS) -o $@ $(SHARED_TK_LIBS) -L. -ltk$(TCL_TK_VER) -ltcl$(TCL_TK_VER) -lom $(tkobjs) libtess/libtess.a $(GLX)
+tkzinc_debug: libtess/libtess.a tkzinc_debug$(ZINC_VER).$(ZINC_MAJOR).so
+tkzinc_debug$(ZINC_VER).$(ZINC_MAJOR).so: tk $(tkgobjs) libom_debug.so libtess/libtess.a
+	$(CC) $(SHARED_TK_LDFLAGS) -o $@ $(SHARED_TK_LIBS) -L.  -ltk$(TCL_TK_VER) -ltcl$(TCL_TK_VER) -lom_debug $(tkgobjs) libtess/libtess.a $(GLX)
 tkzinc_profile: tkzinc_profile.a libom.so
 	$(CC) -pg -o zincwish $(SHARED_TK_LIBS) -L.  -ltk$(TCL_TK_VER) -ltcl$(TCL_TK_VER) -lom tkAppInit.c tkzinc_profile.a -o zincwish
 tkzinc_profile.a: tk $(tkpgobjs) libom_debug.so
 	ar rv $@ $(tkpgobjs)
 
+libtess/libtess.a:
+	(cd libtess; xmkmf; make)
 libom.so: om $(omobjs)
 	$(CC) $(SHARED_TK_LDFLAGS) -o $@ $(omobjs) -lm
 libom_debug.so: om $(omgobjs)
 	$(CC) $(SHARED_TK_LDFLAGS) -o $@ $(omgobjs) -lm
 
+python: Python/Zinc.py
+
+Python/Zinc.py: Python/Zinc.py.in
+	cd Python;rm -f Zinc.py; sed -e "s/ZINC_VER/$(ZINC_VER)/g" -e "s/ZINC_MAJOR/$(ZINC_MAJOR)/g"  Zinc.py.in  > Zinc.py
+
 tk:
 	-mkdir tk
 
@@ -251,8 +260,10 @@ distclean: Perl/Makefile_nodebug
 	-rm -f *~ *.bak *.tar *.orig *.rej core a.out tk/*.o tk/*.g ptk/*.o ptk/*.g
 	-rm -f *.a *.so* lints tmp*
 	-rm -rf *temp
-	-cd doc; rm -rf refman.aux refman.dvi refman.idx refman.lof refman.log refman.lot
-	-cd doc; rm -rf refman.toc refman.pdf refman.ilg refman.ind refman refman.out refman.tpt
+	(cd doc; rm -rf refman.aux refman.dvi refman.idx refman.lof \
+	   refman.log refman.lot refman.toc refman.pdf refman.ilg \
+	   refman.ind refman refman.out refman.tpt)
+	(cd libtess; rm -f *.bak Makefile *.o *.a)
 	(cd Perl; make clean)
 
 depend: