Suppression de GPC et de Bezier.c

1 files changed, 13 insertions, 32 deletions

diff --git a/Makefile.in b/Makefile.in
index 60a19d0..e919cc2 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -64,14 +64,12 @@ CPPFLAGS =  @DEFS@ @X_CFLAGS@ $(DFLAGS) -I$(TK_INCLUDE_PATH) -I$(srcdir) -DBUILD
 PTKLIB = @TKLIB@/pTk
 PTKCFLAGS = -DPTK -I$(PTKLIB)
 #
-# Define this to use the polygon clipper.
-GPC=libgpc.so
-#GPC=
-#
 # Define this to use OpenGL
+# libGLU is needed even if GL support is disabled
+# the GLU tesselator replace GPC.
 #
 GLX=-lGLU -lGL -lpthread
-#GLX=
+#GLX=-lGLU
 
 #
 # Recognized compilation time flags are :
@@ -82,14 +80,7 @@ GLX=-lGLU -lGL -lpthread
 #	GLX_PRINT_CONFIG	display the detected hardware capabilities
 #	GLX_DAMAGE		redraw only modified areas
 #	SHAPE			include code for reshaping windows.
-#	GPC			include code for composing polygons.
-#
-ifeq ($(strip $(GPC)),'')
-DFLAGS = -DOM -DSHAPE
-else
-DFLAGS= -DOM -DSHAPE -DGPC -DGLX -DGLX_DAMAGE -DGLX_PRINT_CONFIG
-#DFLAGS= -DOM -DSHAPE -DGPC
-endif
+DFLAGS= -DOM -DSHAPE -DGLX -DGLX_DAMAGE -DGLX_PRINT_CONFIG
 #DFLAGS = -DTCL_MEM_DEBUG
 
 #
@@ -99,7 +90,7 @@ endif
 #------- Nothing to be modified by users below this line (hopefully ;-) ) ----------------
 #
 cfiles = Track.c Tabular.c Reticle.c Map.c Rectangle.c Arc.c Curve.c	\
-	Bezier.c Item.c PostScript.c MapInfo.c Attrs.c Draw.c Geo.c List.c \
+	Item.c PostScript.c MapInfo.c Attrs.c Draw.c Geo.c List.c \
 	perfos.c version.c Transfo.c Group.c Icon.c Text.c Image.c Color.c \
 	Field.c Triangles.c Window.c
 tkcfiles = tkZinc.c
@@ -156,17 +147,17 @@ 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 $(GPC)
-	$(CC) $(SHARED_TK_LDFLAGS) -o $@ $(ptkobjs) $(SHARED_TK_LIBS) -L. -lom $(GPC) $(GLX) 
-libptkzinc_debug$(ZINC_VER).$(ZINC_MAJOR).so: ptk $(ptkgobjs) libom_debug.so $(GPC)
-	$(CC) $(SHARED_TK_LDFLAGS) -o $@ $(ptkgobjs) $(SHARED_TK_LIBS)  -L. -lom_debug $(GPC) $(GLX)
+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)
 
 tkzinc: tkzinc$(ZINC_VER).$(ZINC_MAJOR).so
-tkzinc$(ZINC_VER).$(ZINC_MAJOR).so: tk $(tkobjs) libom.so $(GPC)
-	$(CC) $(SHARED_TK_LDFLAGS) -o $@ $(SHARED_TK_LIBS) -L. -ltk$(TCL_TK_VER) -ltcl$(TCL_TK_VER) -lom $(GPC) $(GLX) $(tkobjs)
+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 $(GPC)
-	$(CC) $(SHARED_TK_LDFLAGS) -o $@ $(SHARED_TK_LIBS) -L.  -ltk$(TCL_TK_VER) -ltcl$(TCL_TK_VER) -lom_debug $(GPC) $(GLX) $(tkgobjs)
+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)
 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
@@ -177,9 +168,6 @@ libom.so: tk $(omobjs)
 libom_debug.so: tk $(omgobjs)
 	$(CC) $(SHARED_TK_LDFLAGS) -o $@ $(omgobjs) -lm
 
-libgpc.so: tk gpc/gpc.c gpc/gpc.h
-	$(CC) $(SHARED_TK_LDFLAGS) $(SHARED_LIB_CFLAGS) -o $@ gpc/gpc.c -lm
-
 tk:
 	-mkdir tk
 
@@ -199,18 +187,11 @@ doc/refman.pdf: doc/refman.tex
 	makeindex refman.idx; pdflatex refman.tex; \
 	thumbpdf refman.pdf;)
 
-ifeq ($(strip($GPC)),)
-install: installtk installptk installom installgpc
-else
 install: installtk installptk installom
-endif
 
 installom: libom.so
 	$(INSTALL_DATA) libom.so $(libdir)
 
-installgpc: $(GPC)
-	$(INSTALL_DATA) $(GPC) $(libdir)
-
 installtk: installdirs $(tklibs)
 	$(INSTALL_DATA) $(tklibs) $(libdir)
 	cd $(libdir) && rm -f libtkzinc.so