fix up Makefile.am for smyrna file churn

diff --git a/cmd/smyrna/Makefile.am b/cmd/smyrna/Makefile.am
index 0c6f932d26c97c2ce7bb7acccc9aee9f25bca17f..804bea885594da3a0fbb07c3778f27f5b6d4e74d 100644 (file)
--- a/cmd/smyrna/Makefile.am
+++ b/cmd/smyrna/Makefile.am
@@ -24,15 +24,15 @@ AM_CPPFLAGS = \
        $(GTK_CFLAGS) $(GTKGLEXT_CFLAGS) $(GLADE_CFLAGS) $(FREETYPE2_CFLAGS) $(FONTCONFIG_CFLAGS)
 
 if WITH_SMYRNA
-noinst_HEADERS = draw.h gltemplate.h hier.h materials.h support.h topview.h \
-       trackball.h tvnodes.h viewport.h smyrnadefs.h glexpose.h topviewdata.h \
-       topviewdefs.h gui/glmenu.h
+noinst_HEADERS = btree.h draw.h filter.h gltemplate.h hier.h materials.h \
+       selection.h support.h topview.h trackball.h tvnodes.h viewport.h \
+       smyrnadefs.h glexpose.h topviewdata.h topviewdefs.h gui/glmenu.h 
 bin_PROGRAMS = smyrna
 endif
 
-smyrna_SOURCES = draw.c gltemplate.c hier.c main.c support.c template.c \
-       topview.c trackball.c tvnodes.c viewport.c glexpose.c topviewdata.c \
-       gui/glmenu.c
+smyrna_SOURCES = btree.c draw.c filter.c gltemplate.c hier.c main.c support.c \
+       template.c topview.c trackball.c tvnodes.c viewport.c glexpose.c \
+       topviewdata.c gui/glmenu.c
 
 smyrna_LDADD = $(top_builddir)/lib/cgraph/libcgraph_C.la \
                $(top_builddir)/lib/cdt/libcdt_C.la \

diff --git a/lib/utilities/Makefile.am b/lib/utilities/Makefile.am
index b1cfd66a9687e1c8eabb8d80428894dd83fa55d9..7ebe337b812adf4ec338085a70df80e6273d2f79 100644 (file)
--- a/lib/utilities/Makefile.am
+++ b/lib/utilities/Makefile.am
@@ -14,13 +14,11 @@ AM_CPPFLAGS = \
 if WITH_SMYRNA
 noinst_HEADERS = \
        abstring.h cclass.h cname.h glTexFont.h glTexFontDefs.h \
-       glTexFontInclude.h glTexFontTGA.h opengl_pango.h regex.h \
-       regex2.h selection.h strcasecmp.h utils.h
+       glTexFontInclude.h glTexFontTGA.h opengl_pango.h utils.h
 
 noinst_LTLIBRARIES = libutilities_C.la
 endif
 
 libutilities_C_la_SOURCES = \
        abstring.c glTexFont.c glTexFontColor.c glTexFontTGA.c \
-       opengl_pango.c pangotest.c selection.c strcasecmp.c \
-       intersect.c
+       opengl_pango.c pangotest.c intersect.c