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 c829b0c96273706a86ba2fe7b9c8c964f1e8b392..91cd8f6925a2d4695bd58a7393a6e2c567462858 100644 (file)
--- 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