*** empty log message ***

diff --git a/lib/gui/Makefile.am b/lib/gui/Makefile.am
index 37cf93127495f9f585aebc9312ce3177e234f522..eb69687bc45ede7b79c4e227dd4d17cf441d26cc 100644 (file)
--- a/lib/gui/Makefile.am
+++ b/lib/gui/Makefile.am
@@ -2,25 +2,22 @@
 # ## Process this file with automake to produce Makefile.in
 #
 
-guidir = $(pkgdatadir)/gui
+gladedir = $(datadir)/gtktopview/glade
 
 AM_CPPFLAGS = \
-       -DSMYRNA_GLADE=\""$(guidir)/smyrna.glade"\" \
-       -DSMYRNA_ATTRS=\""$(guidir)/attrs.txt"\" \
+       -DGTKTOPVIEW_GLADE=\""$(gladedir)/gtktopview.glade"\" \
+       -DGTKTOPVIEW_ATTRS=\""$(gladedir)/attrs.txt"\" \
        -I$(top_srcdir) \
        -I$(top_srcdir)/lib/xdot \
        -I$(top_srcdir)/lib/cgraph \
        -I$(top_srcdir)/lib/cdt \
        -I$(top_srcdir)/lib/utilities \
-       -I$(top_srcdir)/lib/topfish \
-       -I$(top_srcdir)/cmd/smyrna \
+       -I$(top_srcdir)/cmd/gtktopview \
        $(GTK_CFLAGS) $(GTKGL_CFLAGS) $(GTKGLEXT_CFLAGS) $(GLADE_CFLAGS) $(FREETYPE2_CFLAGS)
 
-if WITH_SMYRNA
 noinst_HEADERS = callbacks.h datalistcallbacks.h gui.h \
        menucallbacks.h toolboxcallbacks.h
-noinst_LTLIBRARIES = libgui_C.la
-endif
+noinst_LTLIBRARIES = libGUI_C.la
 
-libgui_C_la_SOURCES = gui.c callbacks.c datalistcallbacks.c \
+libGUI_C_la_SOURCES = gui.c callbacks.c datalistcallbacks.c \
        menucallbacks.c toolboxcallbacks.c