Cleaned up GUI, by objectifying the data editor. Removed a number of global variables.

[pspp-builds.git] / src / ui / gui / automake.mk

diff --git a/src/ui/gui/automake.mk b/src/ui/gui/automake.mk
index 5115a6420b9b4844aac8f05c51be89aadbda40b6..e35af3654994e4f81bdfd05dac6de87a9972b13f 100644 (file)
--- a/src/ui/gui/automake.mk
+++ b/src/ui/gui/automake.mk
@@ -2,18 +2,25 @@
 
 bin_PROGRAMS += src/ui/gui/psppire
 
-src/ui/gui/%: AM_CFLAGS = $(GTK_CFLAGS) $(GLADE_CFLAGS) -Wall
+src_ui_gui_psppire_CFLAGS = $(GTK_CFLAGS) $(GLADE_CFLAGS) -Wall
 
 src_ui_gui_psppire_LDFLAGS = \
        -export-dynamic 
 
 src_ui_gui_psppire_LDADD = \
+       lib/gtksheet/libgtksheet.a \
+       src/language/liblanguage.a \
+       src/ui/libuicommon.a \
+       src/output/charts/libcharts.a \
+       src/output/liboutput.a \
+       src/math/libpspp_math.a  \
+       src/math/linreg/libpspp_linreg.a  \
+       lib/linreg/liblinreg.a  \
+       lib/gsl-extras/libgsl-extras.a  \
+       src/data/libdata.a \
+       src/libpspp/libpspp.a \
        $(GTK_LIBS) \
        $(GLADE_LIBS) \
-       $(top_builddir)/lib/gtksheet/libgtksheet.a \
-       $(top_builddir)/src/math/libpspp_math.a \
-       $(top_builddir)/src/data/libdata.a \
-       $(top_builddir)/src/libpspp/libpspp.a \
        $(top_builddir)/gl/libgl.a \
        @LIBINTL@ @LIBREADLINE@
 
@@ -21,20 +28,33 @@ src_ui_gui_psppiredir = $(pkgdatadir)
 
 dist_src_ui_gui_psppire_DATA = \
        $(top_srcdir)/src/ui/gui/psppire.glade \
+       $(top_srcdir)/src/ui/gui/syntax-editor.glade \
+       $(top_srcdir)/src/ui/gui/data-editor.glade \
        $(top_srcdir)/src/ui/gui/psppicon.png \
-       $(top_srcdir)/src/ui/gui/pspplogo.png
+       $(top_srcdir)/src/ui/gui/pspplogo.png \
+       $(top_srcdir)/src/ui/gui/icons/value-labels.png \
+       $(top_srcdir)/src/ui/gui/icons/goto-variable.png\
+       $(top_srcdir)/src/ui/gui/icons/insert-case.png \
+       $(top_srcdir)/src/ui/gui/icons/insert-variable.png \
+       $(top_srcdir)/src/ui/gui/icons/split-file.png \
+       $(top_srcdir)/src/ui/gui/icons/select-cases.png \
+       $(top_srcdir)/src/ui/gui/icons/weight-cases.png
 
 
 src_ui_gui_psppire_SOURCES = \
+       src/ui/gui/about.c \
+       src/ui/gui/about.h \
        src/ui/gui/customentry.c \
        src/ui/gui/customentry.h \
        src/ui/gui/data-sheet.c \
        src/ui/gui/data-sheet.h \
+       src/ui/gui/data-editor.c \
+       src/ui/gui/data-editor.h \
+       src/ui/gui/flexifile-factory.h \
+       src/ui/gui/flexifile-factory.c \
        src/ui/gui/message-dialog.c \
        src/ui/gui/message-dialog.h \
        src/ui/gui/psppire.c \
-       src/ui/gui/menu-actions.c \
-       src/ui/gui/menu-actions.h \
        src/ui/gui/helper.c \
        src/ui/gui/helper.h \
        src/ui/gui/missing-val-dialog.c \
@@ -47,15 +67,18 @@ src_ui_gui_psppire_SOURCES = \
        src/ui/gui/psppire-dict.h \
        src/ui/gui/psppire-object.c \
        src/ui/gui/psppire-object.h \
-       src/ui/gui/psppire-variable.c \
-       src/ui/gui/psppire-variable.h \
        src/ui/gui/psppire-var-store.c \
        src/ui/gui/psppire-var-store.h \
        src/ui/gui/sort-cases-dialog.c \
        src/ui/gui/sort-cases-dialog.h \
+       src/ui/gui/syntax-editor.c \
+       src/ui/gui/syntax-editor.h \
+       src/ui/gui/syntax-editor-source.c \
+       src/ui/gui/syntax-editor-source.h \
        src/ui/gui/val-labs-dialog.c \
        src/ui/gui/val-labs-dialog.h \
        src/ui/gui/var-sheet.c \
        src/ui/gui/var-sheet.h \
        src/ui/gui/var-type-dialog.c \
-       src/ui/gui/var-type-dialog.h
+       src/ui/gui/var-type-dialog.h \
+       src/ui/gui/window-manager.c