Suppressed the perl target and configuration option

libom is no more. The code is included in the main
module. It will be re-released as an independent
module once stubs will be available for Tkzinc and a
tcl binding will be written for the overlap manager api.

1 files changed, 16 insertions, 49 deletions

diff --git a/Makefile.in b/Makefile.in
index 1c3eeb4..e132032 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -31,12 +31,11 @@
 # unix subdirectory.
 #========================================================================
 
-tess_SOURCES	= 
+Om_SOURCES	= OverlapMan.c
 Tkzinc_SOURCES  = Track.c Tabular.c Reticle.c Map.c Rectangle.c Arc.c Curve.c \
 		  Item.c PostScript.c MapInfo.c Attrs.c Draw.c Geo.c List.c \
 		  perfos.c Transfo.c Group.c Icon.c Text.c Image.c Color.c \
-		  Field.c Triangles.c Window.c tkZinc.c @EXTRA_SOURCES@
-Om_SOURCES	= OverlapMan.c
+		  Field.c Triangles.c Window.c tkZinc.c @EXTRA_SOURCES@ $(Om_SOURCES)
 Tess_SOURCES	= dict.c geom.c memalloc.c mesh.c normal.c priorityq.c \
 		  render.c sweep.c tess.c tessmono.c
 
@@ -59,7 +58,7 @@ Tkzinc_OBJECTS	= $(Tkzinc_SOURCES:.c=.@OBJEXT@)
 Om_OBJECTS	= $(Om_SOURCES:.c=.@OBJEXT@)
 Tess_OBJECTS	= $(Tess_SOURCES:.c=.@OBJEXT@)
 Tkzinc_LIB_FILE	= @Tkzinc_LIB_FILE@
-Om_LIB_FILE	= @Om_LIB_FILE@
+#Om_LIB_FILE	= @Om_LIB_FILE@
 Tess_LIB_FILE	= @Tess_LIB_FILE@
 
 #========================================================================
@@ -82,7 +81,8 @@ GENERIC_HDRS	=
 lib_BINARIES	= $($(PACKAGE)_LIB_FILE)
 aux_BINARIES	= @aux_BINARIES@
 bin_BINARIES	= @bin_BINARIES@
-BINARIES	= $(Tess_LIB_FILE) $(Om_LIB_FILE) $(lib_BINARIES)
+#BINARIES	= $(Tess_LIB_FILE) $(Om_LIB_FILE) $(lib_BINARIES)
+BINARIES	= $(Tess_LIB_FILE) $(lib_BINARIES)
 
 SHELL		= @SHELL@
 
@@ -149,8 +149,6 @@ TK_TOP_DIR_NATIVE	= @TK_TOP_DIR_NATIVE@
 # Not used, but retained for reference of what libs Tcl required
 TCL_LIBS	= @TCL_LIBS@
 
-# Used to know whether we are installing with PTK
-PERL_TK_LIB	= @PERL_TK_LIB@
 
 #========================================================================
 # TCLLIBPATH seeds the auto_path in Tcl's init.tcl so we can test our
@@ -201,7 +199,7 @@ COMPILE		= $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(C
 # for the BINARIES that you specified above have already been done.
 #========================================================================
 
-all: binaries libraries perl doc
+all: binaries libraries doc
 
 #========================================================================
 # The binaries target builds executable programs, Windows .dll's, unix
@@ -242,8 +240,8 @@ html: doc/refman.tex
 	mkdir -p refman; cp -f *.png refman; \
 	latex2html -split 4 -show_section_numbers -local_icons refman.tex)
 
-#install: all install-binaries install-libraries install-demos install-doc perlinstall
-install: all perlinstall
+#install: all install-binaries install-libraries install-demos install-doc
+install: all
 
 install-binaries: binaries install-lib-binaries install-bin-binaries
 
@@ -311,10 +309,8 @@ install-doc: doc
 	  fi \
 	done
 
-test: binaries libraries testperl
-	@if test "x$(PERL_TK_LIB)" = "x"; then \
-	  $(TCLSH) `@CYGPATH@ $(srcdir)/tests/all.tcl` $(TESTFLAGS) ; \
-	fi
+test: binaries libraries
+	$(TCLSH) `@CYGPATH@ $(srcdir)/tests/all.tcl` $(TESTFLAGS) ; \
 
 shell: binaries libraries
 	@$(TCLSH) $(SCRIPT)
@@ -340,15 +336,15 @@ $($(PACKAGE)_LIB_FILE): $($(PACKAGE)_OBJECTS)
 	${MAKE_LIB}
 	$(RANLIB) $($(PACKAGE)_LIB_FILE)
 
-$(Om_LIB_FILE): $(Om_OBJECTS)
-	-rm -f $(Om_LIB_FILE)
-	${SHLIB_LD} -o $@ $(Om_OBJECTS) ${SHLIB_LDFLAGS}
-	$(RANLIB) $(Om_LIB_FILE)
+#$(Om_LIB_FILE): $(Om_OBJECTS)
+#	-rm -f $(Om_LIB_FILE)
+#	${SHLIB_LD} -o $@ $(Om_OBJECTS) ${SHLIB_LDFLAGS}
+#	$(RANLIB) $(Om_LIB_FILE)
 
 $(Tess_LIB_FILE): $(Tess_OBJECTS)
 	-rm -f $(Tess_LIB_FILE)
 	${STLIB_LD} $@ $(Tess_OBJECTS)
-	$(RANLIB) $(Om_LIB_FILE)
+#	$(RANLIB) $(Om_LIB_FILE)
 
 #========================================================================
 # We need to enumerate the list of .c to .o lines here.
@@ -381,7 +377,7 @@ VPATH = $(srcdir):$(srcdir)/libtess:$(srcdir)/generic:$(srcdir)/unix:$(srcdir)/w
 #========================================================================
 
 pkgIndex.tcl:
-	( echo package require Tk \; pkg_mkIndex -load Tk . $($(PACKAGE)_LIB_FILE) \; exit; ) | $(TCLSH)
+	( echo package require Tk \; pkg_mkIndex -verbose -load Tk . $($(PACKAGE)_LIB_FILE) \; exit ) | $(TCLSH)
 
 pkgIndex.tcl-hand:
 	(echo 'package ifneeded $(PACKAGE) $(VERSION) \
@@ -532,32 +528,3 @@ uninstall-binaries:
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
-
-
-#--------------------------------------
-# Targets for perl/Tk
-#--------------------------------------
-
-Perl/Makefile:
-	cd Perl; perl Makefile.PL;
-
-perl: Perl/Makefile binaries
-	@if test "x$(PERL_TK_LIB)" != "x"; then \
-	cd Perl; make; \
-	fi
-
-testperl: Perl/Makefile binaries
-	@if test "x$(PERL_TK_LIB)" != "x"; then \
-	  cd Perl; make test; \
-	fi
-
-demoperl: Perl/Makefile binaries
-	cd Perl; perl -Mblib demos/zinc-demos
-
-perlinstall: Perl/Makefile binaries
-	@echo "ZINC_ENABLE_PTK --> $(ZINC_ENABLE_PTK) $(INSTALL_PROGRAM) $(PERL_TK_LIB) DESTDIR=$(DESTDIR)"
-	@if test "x$(PERL_TK_LIB)" != "x"; then \
-	  $(INSTALL_DATA) $($(PACKAGE)_LIB_FILE) $(prefix)/lib; \
-	  cd Perl; make install; \
-	fi
-