Add missing files to distro, remove unused cmd/smyrna/gui/Makefile.am

diff --git a/cmd/smyrna/Makefile.am b/cmd/smyrna/Makefile.am
index 8912ea32db65dcbbe1f0ff030525400ada64424f..b4bb7a324deff5e463419e2ac92f4caab7906e41 100644 (file)
--- a/cmd/smyrna/Makefile.am
+++ b/cmd/smyrna/Makefile.am
@@ -36,22 +36,24 @@ endif
 endif
 
 noinst_HEADERS = btree.h draw.h filter.h glexpose.h glmotion.h gltemplate.h \
-       hier.h materials.h smyrnadefs.h support.h \
+       hier.h materials.h smyrnadefs.h support.h topview.h selection.h \
        topviewdata.h topviewdefs.h trackball.h tvnodes.h viewport.h hotkeymap.h \
        topfisheyeview.h viewportcamera.h gvprpipe.h md5.h drawxdot.h arcball.h \
-       selectionfuncs.h topviewfuncs.h \
+       selectionfuncs.h topviewfuncs.h polytess.h smyrna_utils.h \
        gui/callbacks.h gui/datalistcallbacks.h gui/filterscallbacks.h \
        gui/frmobjectui.h gui/glcompui.h gui/gui.h gui/menucallbacks.h \
-       gui/toolboxcallbacks.h gui/topviewsettings.h gui/appmouse.h polytess.h smyrna_utils.h
+       gui/toolboxcallbacks.h gui/topviewsettings.h gui/appmouse.h \
+       gui/beacon.h
 
 smyrna_SOURCES = btree.c draw.c filter.c glexpose.c glmotion.c gltemplate.c \
-       hier.c main.c support.c template.c topviewdata.c \
+       hier.c main.c support.c template.c topviewdata.c selection.c \
        topfisheyeview.c trackball.c tvnodes.c viewport.c viewportcamera.c \
-       selectionfuncs.c topviewfuncs.c \
+       selectionfuncs.c topviewfuncs.c topview.c polytess.c smyrna_utils.c \
        gvprpipe.c md5.c drawxdot.c arcball.c hotkeymap.c \
        gui/callbacks.c gui/datalistcallbacks.c gui/filterscallbacks.c \
        gui/frmobjectui.c gui/glcompui.c gui/gui.c gui/menucallbacks.c \
-       gui/toolboxcallbacks.c gui/topviewsettings.c gui/appmouse.c polytess.c smyrna_utils.c
+       gui/toolboxcallbacks.c gui/topviewsettings.c gui/appmouse.c \
+       gui/beacon.c
 
 smyrna_LDADD = $(top_builddir)/lib/cgraph/libcgraph_C.la \
                $(top_builddir)/lib/cdt/libcdt_C.la \

diff --git a/cmd/smyrna/gui/Makefile.am b/cmd/smyrna/gui/Makefile.am
deleted file mode 100644 (file)
index 47c198e..0000000
--- a/cmd/smyrna/gui/Makefile.am
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id$ $Revision$
-# ## Process this file with automake to produce Makefile.in
-#
-
-guidir = $(pkgdatadir)/gui
-
-AM_CPPFLAGS = \
-       -DSMYRNA_GLADE=\""$(guidir)/smyrna.glade"\" \
-       -DSMYRNA_ATTRS=\""$(guidir)/attrs.txt"\" \
-       -I$(top_srcdir) \
-       -I$(top_srcdir)/lib/xdot \
-       -I$(top_srcdir)/lib/cgraph \
-       -I$(top_srcdir)/lib/cdt \
-       -I$(top_srcdir)/lib/glcomp \
-       -I$(top_srcdir)/lib/utilities \
-       -I$(top_srcdir)/lib/neaotgen \
-       -I$(top_srcdir)/lib/topfish \
-       -I$(top_srcdir)/cmd/smyrna/gui \
-       -I$(top_srcdir)/cmd/smyrna \
-       $(GTK_CFLAGS) $(GTKGL_CFLAGS) $(GTKGLEXT_CFLAGS) $(GLADE_CFLAGS) $(FREETYPE2_CFLAGS)
-
-noinst_HEADERS = callbacks.h datalistcallbacks.h filterscallbacks.h \
-       gui.h menucallbacks.h toolboxcallbacks.h beacon.h frmobjectui.h \
-       glcompui.h
-if WITH_SMYRNA
-noinst_LTLIBRARIES = libgui_C.la
-endif
-
-libgui_C_la_SOURCES = callbacks.c datalistcallbacks.c filterscallbacks.c \
-       gui.c menucallbacks.c toolboxcallbacks.c beacon.c frmobjectui.c \
-       glcompui.c