smyrna Makefile.am fixes

diff --git a/cmd/smyrna/Makefile.am b/cmd/smyrna/Makefile.am
index b89b3cf3f19a5b02379dc3275d55382def280740..bff21470b220b27ee22c1ad9be71d7e4fa988f25 100644 (file)
--- a/cmd/smyrna/Makefile.am
+++ b/cmd/smyrna/Makefile.am
@@ -16,16 +16,19 @@ AM_CPPFLAGS = \
         -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 = draw.h gltemplate.h hier.h materials.h support.h topview.h \
-       trackball.h tvnodes.h viewport.h smyrnadefs.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
+       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/cmd/smyrna/gltemplate.c b/cmd/smyrna/gltemplate.c
index f453b6c60fa628bb9a7446892d0056837e58f5a9..ed415cc857fb3db44ccd92c162cc07a34cda7916 100755 (executable)
--- a/cmd/smyrna/gltemplate.c
+++ b/cmd/smyrna/gltemplate.c
@@ -117,12 +117,12 @@ static void realize (GtkWidget *widget,gpointer   data)
 
 
 #ifdef WIN32
-#define SMYRNA_OPENGL_FONT "c:/arial.tga"
+#define SMYRNA_FONT "c:/arial.tga"
 // #else
-// using -DGTKTOPVIEW_FONT from Makefile.am and configure.ac
+// using -DSMYRNA_FONT from Makefile.am and configure.ac
 #endif
 
-  g_print("loading font....%i\n",fontLoad(SMYRNA_OPENGL_FONT));
+  g_print("loading font....%i\n",fontLoad(SMYRNA_FONT));
 
   /*** OpenGL BEGIN ***/
   if (!gdk_gl_drawable_gl_begin (gldrawable, glcontext))