From: erg <devnull@localhost>
Date: Wed, 19 Mar 2008 21:43:58 +0000 (+0000)
Subject: Clean up smyrna files:
X-Git-Tag: LAST_LIBGRAPH~32^2~4472
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5079902ae74d455b0f3bd23fb70d9dfc8a9240f4;p=graphviz

Clean up smyrna files:
  remove unnecessary globals
  modify libraries not to rely on code in cmd/smyrna
  remove static declarations from .h files
  remove unnecessary libraries
  mark unused code and clean up warnings
---

diff --git a/lib/glcomp/Makefile.am b/lib/glcomp/Makefile.am
index c829b0c96..91cd8f692 100644
--- a/lib/glcomp/Makefile.am
+++ b/lib/glcomp/Makefile.am
@@ -3,15 +3,13 @@
 
 AM_CPPFLAGS = \
 	-I$(top_srcdir) \
-	-I$(top_srcdir)/lib/cgraph \
-	-I$(top_srcdir)/lib/cdt \
-	-I$(top_srcdir)/lib/utilities \
-	-I$(top_srcdir)/cmd/smyrna \
 	$(GTK_CFLAGS) $(GTKGL_CFLAGS) $(GTKGLEXT_CFLAGS) $(GLADE_CFLAGS) $(FREETYPE2_CFLAGS)
 
 if WITH_SMYRNA
-noinst_HEADERS = glcompset.h glcomptexture.h glutils.h
+noinst_HEADERS = glcompset.h glcomptexture.h glutils.h \
+	glTexFont.h glTexFontDefs.h glTexFontInclude.h glTexFontTGA.h
 noinst_LTLIBRARIES = libglcomp_C.la
 endif
 
-libglcomp_C_la_SOURCES = glcompset.c glcomptexture.c glutils.c
+libglcomp_C_la_SOURCES = glcompset.c glcomptexture.c glutils.c \
+	glTexFont.c glTexFontColor.c glTexFontTGA.c