From f9cbd6eb9b07f6db3cd4f13cc7576e274fba4b03 Mon Sep 17 00:00:00 2001
From: ellson <devnull@localhost>
Date: Tue, 4 Mar 2008 18:17:53 +0000
Subject: [PATCH] adjust Makefile.am for move of gui under smyrna

---
 cmd/smyrna/Makefile.am | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/cmd/smyrna/Makefile.am b/cmd/smyrna/Makefile.am
index 804bea885..628541cf6 100644
--- a/cmd/smyrna/Makefile.am
+++ b/cmd/smyrna/Makefile.am
@@ -3,6 +3,7 @@ icondir = $(pkgdatadir)/icons
 
 AM_CPPFLAGS = \
 	-DSMYRNA_GLADE=\""$(guidir)/smyrna.glade"\" \
+	-DSMYRNA_ATTRS=\""$(guidir)/attrs.txt"\" \
 	-DSMYRNA_FONT=\""$(guidir)/arial.tga"\" \
 	-DSMYRNA_ICON_PAN=\""$(icondir)/pan.raw"\" \
 	-DSMYRNA_ICON_ZOOM=\""$(icondir)/zoom.raw"\" \
@@ -18,21 +19,24 @@ AM_CPPFLAGS = \
         -I$(top_srcdir)/lib/xdot \
         -I$(top_srcdir)/lib/glcomp \
         -I$(top_srcdir)/lib/topfish \
-        -I$(top_srcdir)/lib/gui \
         -I$(top_srcdir)/lib/common \
         -I$(top_srcdir)/cmd/smyrna/gui \
 	$(GTK_CFLAGS) $(GTKGLEXT_CFLAGS) $(GLADE_CFLAGS) $(FREETYPE2_CFLAGS) $(FONTCONFIG_CFLAGS)
 
 if WITH_SMYRNA
-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 
+noinst_HEADERS = btree.h draw.h filter.h glexpose.h gltemplate.h hier.h \
+	materials.h selection.h smyrnadefs.h support.h topview.h \
+	topviewdata.h topviewdefs.h trackball.h tvnodes.h viewport.h \
+	gui/callbacks.h gui/datalistcallbacks.h gui/filterscallbacks.h \
+	gui/glmenu.h gui/gui.h gui/menucallbacks.h gui/toolboxcallbacks.h
 bin_PROGRAMS = smyrna
 endif
 
-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_SOURCES = btree.c draw.c filter.c glexpose.c gltemplate.c hier.c \
+	main.c selection.c support.c template.c topview.c topviewdata.c \
+	trackball.c tvnodes.c viewport.c \
+	gui/callbacks.c gui/datalistcallbacks.c gui/filterscallbacks.c \
+	gui/glmenu.c gui/gui.c gui/menucallbacks.c gui/toolboxcallbacks.c
 
 smyrna_LDADD = $(top_builddir)/lib/cgraph/libcgraph_C.la \
 		$(top_builddir)/lib/cdt/libcdt_C.la \
@@ -41,6 +45,5 @@ smyrna_LDADD = $(top_builddir)/lib/cgraph/libcgraph_C.la \
 		$(top_builddir)/lib/glcomp/libglcomp_C.la \
 		$(top_builddir)/lib/topfish/libtopfish_C.la \
 		$(top_builddir)/lib/filter/libfilter_C.la \
-		$(top_builddir)/lib/gui/libgui_C.la \
 		$(top_builddir)/lib/common/libcommon_C.la \
 		$(GTK_LIBS) $(GTKGLEXT_LIBS) $(GLADE_LIBS) $(EXPAT_LIBS)
-- 
2.40.0