aboutsummaryrefslogtreecommitdiff
path: root/Makefile.in
diff options
context:
space:
mode:
authorlecoanet2005-01-24 12:19:27 +0000
committerlecoanet2005-01-24 12:19:27 +0000
commit8f19fda4baa210eab4dd9c508b5aca253c13a0c4 (patch)
tree60b8c2ea44bc2813362a46b6f711ab731c78368a /Makefile.in
parenta56b4764d2773a957658e496b0e2863e27b0bca9 (diff)
downloadtkzinc-8f19fda4baa210eab4dd9c508b5aca253c13a0c4.zip
tkzinc-8f19fda4baa210eab4dd9c508b5aca253c13a0c4.tar.gz
tkzinc-8f19fda4baa210eab4dd9c508b5aca253c13a0c4.tar.bz2
tkzinc-8f19fda4baa210eab4dd9c508b5aca253c13a0c4.tar.xz
Suppressed the conditional compilation of the anti-overlapping
code. Added the conditional compilation of all the atc code.
Diffstat (limited to 'Makefile.in')
-rw-r--r--Makefile.in20
1 files changed, 6 insertions, 14 deletions
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)