diff options
| author | lecoanet | 2005-04-12 08:35:11 +0000 |
|---|---|---|
| committer | lecoanet | 2005-04-12 08:35:11 +0000 |
| commit | 1c9480facff9b6943d42ca8906e343ed6abb1df3 (patch) | |
| tree | 58a80414545c207520f68fe46834708954065c3e /Makefile.in | |
| parent | a864cd2702c43214c40dbba895052191adc609fe (diff) | |
| download | tkzinc-1c9480facff9b6943d42ca8906e343ed6abb1df3.zip tkzinc-1c9480facff9b6943d42ca8906e343ed6abb1df3.tar.gz tkzinc-1c9480facff9b6943d42ca8906e343ed6abb1df3.tar.bz2 tkzinc-1c9480facff9b6943d42ca8906e343ed6abb1df3.tar.xz | |
Switched the linux/macos build to the system GLU tesselator instead of the buildin
Diffstat (limited to 'Makefile.in')
| -rw-r--r-- | Makefile.in | 19 |
1 files changed, 4 insertions, 15 deletions
diff --git a/Makefile.in b/Makefile.in index 761fcf7..3b6944d 100644 --- a/Makefile.in +++ b/Makefile.in @@ -37,8 +37,6 @@ Tkzinc_SOURCES = Tabular.c Rectangle.c Arc.c Curve.c Item.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 WIN_SOURCES = WinPort.c UNIX_SOURCES = @@ -55,9 +53,7 @@ UNIX_SOURCES = #======================================================================== Tkzinc_OBJECTS = $(Tkzinc_SOURCES:.c=.@OBJEXT@) -Tess_OBJECTS = $(Tess_SOURCES:.c=.@OBJEXT@) Tkzinc_LIB_FILE = @Tkzinc_LIB_FILE@ -Tess_LIB_FILE = @Tess_LIB_FILE@ #======================================================================== # RUNTIME_SOURCES identifies Tcl runtime files that are associated with @@ -79,7 +75,7 @@ GENERIC_HDRS = lib_BINARIES = $($(PACKAGE)_LIB_FILE) aux_BINARIES = @aux_BINARIES@ bin_BINARIES = @bin_BINARIES@ -BINARIES = $(Tess_LIB_FILE) $(lib_BINARIES) +BINARIES = $(lib_BINARIES) SHELL = @SHELL@ @@ -102,7 +98,6 @@ pkgincludedir = $(includedir)/$(PKG_DIR) top_builddir = . -tess_dir = $(srcdir)/libtess generic_dir = $(srcdir)/generic unix_dir = $(srcdir)/unix windows_dir = $(srcdir)/win @@ -169,8 +164,7 @@ SHARED_BUILD = @SHARED_BUILD@ # The local includes must come first, because the TK_XINCLUDES can be # just a comment -INCLUDES = -I$(srcdir)/generic \ - @TCL_INCLUDES@ @TK_INCLUDES@ @TK_XINCLUDES@ @GL_INCLUDES@ -I$(tess_dir) +INCLUDES = -I$(srcdir)/generic @TCL_INCLUDES@ @TK_INCLUDES@ @TK_XINCLUDES@ @GL_INCLUDES@ EXTRA_CFLAGS = $(MEM_DEBUG_FLAGS) @EXTRA_CFLAGS@ @@ -331,11 +325,6 @@ $($(PACKAGE)_LIB_FILE): $($(PACKAGE)_OBJECTS) ${MAKE_LIB} #$(RANLIB) $($(PACKAGE)_LIB_FILE) -$(Tess_LIB_FILE): $(Tess_OBJECTS) - -rm -f $(Tess_LIB_FILE) - ${STLIB_LD} $@ $(Tess_OBJECTS) - $(RANLIB) $(Tess_LIB_FILE) - #======================================================================== # We need to enumerate the list of .c to .o lines here. # @@ -351,7 +340,7 @@ $(Tess_LIB_FILE): $(Tess_OBJECTS) # As necessary, add $(srcdir):$(srcdir)/compat:.... #======================================================================== -VPATH = $(srcdir):$(srcdir)/libtess:$(srcdir)/generic:$(srcdir)/unix:$(srcdir)/win +VPATH = $(srcdir):$(srcdir)/generic:$(srcdir)/unix:$(srcdir)/win .SUFFIXES: .c .$(OBJEXT) @@ -402,7 +391,7 @@ dist: dist-clean chmod 664 $(DIST_DIR)/tclconfig/tcl.m4 chmod +x $(DIST_DIR)/tclconfig/install-sh - -list='demos doc generic libtess debian redhat library mac tests unix win Perl Python'; \ + -list='demos doc generic debian redhat library mac tests unix win Perl Python'; \ for p in $$list; do \ if test -d $(srcdir)/$$p ; then \ tar cf - --exclude=CVS --exclude=.cvsignore $$p | \ |