projects / pspp-builds.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Numerous GUI enhancements.
[pspp-builds.git] / src / ui / gui / automake.mk
diff --git a/src/ui/gui/automake.mk b/src/ui/gui/automake.mk
index 545e9345217f45bd93ae541d9428063b12eba33a..18ba45a00b5a4b2dbddf14d949bc3f4121af2951 100644 (file)
--- a/src/ui/gui/automake.mk
+++ b/src/ui/gui/automake.mk
@@ -1,63 +1,123 @@
 ## Process this file with automake to produce Makefile.in  -*- makefile -*-
 
-bin_PROGRAMS += src/ui/gui/psppire
 
-src/ui/gui/%: AM_CPPFLAGS += \
-       -export-dynamic \
-       -I$(top_srcdir)/gl \
-       -I$(top_srcdir)/lib/gtksheet \
-       -I$(top_srcdir)/src/libpspp \
-       -I$(top_srcdir)/src/data \
-       -I$(top_srcdir)/src/ui/gui 
 
+bin_PROGRAMS += src/ui/gui/psppire 
+
+src_ui_gui_psppire_CFLAGS = $(GTK_CFLAGS) $(GLADE_CFLAGS) -Wall \
+       -DINSTALLDIR=\"$(bindir)\"
 
-src/ui/gui/%: AM_CFLAGS = $(GTK_CFLAGS) $(GLADE_CFLAGS) -Wall
 
 src_ui_gui_psppire_LDFLAGS = \
        -export-dynamic 
 
+
+if RELOCATABLE_VIA_LD
+src_ui_gui_psppire_LDFLAGS += `$(RELOCATABLE_LDFLAGS) $(bindir)`
+else
+src_ui_gui_psppire_LDFLAGS += -rpath $(pkglibdir)
+endif
+
+
+pkglib_LTLIBRARIES = src/ui/gui/libpsppire.la
+
+src_ui_gui_libpsppire_la_CFLAGS = $(GLADE_CFLAGS) 
+
+src_ui_gui_libpsppire_la_SOURCES = \
+       src/ui/gui/glade-register.c
+
 src_ui_gui_psppire_LDADD = \
+       -dlopen src/ui/gui/libpsppire.la \
+       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) \
-       -lgtksheet -L$(top_builddir)/lib/gtksheet \
-       -ldata -L$(top_builddir)/src/data \
-       -lpspp -L$(top_builddir)/src/libpspp \
-        -lgl -L$(top_builddir)/gl    \
-        @LIBINTL@ @LIBREADLINE@
+       gl/libgl.la \
+       @LIBINTL@ @LIBREADLINE@
+
+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/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/dialog-common.c \
+       src/ui/gui/dialog-common.h \
+       src/ui/gui/dict-display.c \
+       src/ui/gui/dict-display.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 \
        src/ui/gui/missing-val-dialog.h \
-       src/ui/gui/psppire-case-array.c \
-       src/ui/gui/psppire-case-array.h \
+       src/ui/gui/psppire-buttonbox.c \
+       src/ui/gui/psppire-buttonbox.h \
+       src/ui/gui/psppire-case-file.c \
+       src/ui/gui/psppire-case-file.h \
        src/ui/gui/psppire-data-store.c \
        src/ui/gui/psppire-data-store.h \
+       src/ui/gui/psppire-dialog.c \
+       src/ui/gui/psppire-dialog.h \
        src/ui/gui/psppire-dict.c \
        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-keypad.c \
+       src/ui/gui/psppire-keypad.h \
+       src/ui/gui/psppire-selector.c \
+       src/ui/gui/psppire-selector.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/split-file-dialog.c \
+       src/ui/gui/split-file-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/transpose-dialog.c \
+       src/ui/gui/transpose-dialog.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/weight-cases-dialog.c \
+       src/ui/gui/weight-cases-dialog.h \
+       src/ui/gui/window-manager.c \
+       src/ui/gui/window-manager.h
 
 
PSPP build tags.