From 8f19fda4baa210eab4dd9c508b5aca253c13a0c4 Mon Sep 17 00:00:00 2001
From: lecoanet
Date: Mon, 24 Jan 2005 12:19:27 +0000
Subject: Suppressed the conditional compilation of the anti-overlapping code.
 Added the conditional compilation of all the atc code.

---
 Makefile.in | 20 ++++++--------------
 1 file changed, 6 insertions(+), 14 deletions(-)

(limited to 'Makefile.in')

diff --git a/Makefile.in b/Makefile.in
index dab7ce2..761fcf7 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -31,11 +31,12 @@
 # unix subdirectory.
 #========================================================================
 
-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)
+Atc_SOURCES	= @Atc_SOURCES@
+Tkzinc_SOURCES  = Tabular.c Rectangle.c Arc.c Curve.c Item.c \
+									PostScript.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@ $(Atc_SOURCES)
 Tess_SOURCES	= dict.c geom.c memalloc.c mesh.c normal.c priorityq.c \
 		  render.c sweep.c tess.c tessmono.c
 
@@ -51,14 +52,11 @@ UNIX_SOURCES	=
 #
 # "Tkzinc_LIB_FILE" refers to the library (dynamic or static as per
 # configuration options) composed of the named objects.
-# "Om_LIB_FILE" refers to the optional pluggable overlap manager.
 #========================================================================
 
 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@
 Tess_LIB_FILE	= @Tess_LIB_FILE@
 
 #========================================================================
@@ -81,7 +79,6 @@ 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) $(lib_BINARIES)
 
 SHELL		= @SHELL@
@@ -334,11 +331,6 @@ $($(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)
-
 $(Tess_LIB_FILE): $(Tess_OBJECTS)
 	-rm -f $(Tess_LIB_FILE)
 	${STLIB_LD} $@ $(Tess_OBJECTS)
-- 
cgit v1.1