projects
/
pspp-builds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Continue reforming error message support. In this phase, drop actual
[pspp-builds.git]
/
src
/
ui
/
gui
/
automake.mk
diff --git
a/src/ui/gui/automake.mk
b/src/ui/gui/automake.mk
index 545e9345217f45bd93ae541d9428063b12eba33a..f1dea45330e26b8c9f3211a02695c404ceeb0450 100644
(file)
--- a/
src/ui/gui/automake.mk
+++ b/
src/ui/gui/automake.mk
@@
-2,15
+2,6
@@
bin_PROGRAMS += src/ui/gui/psppire
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
-
-
src/ui/gui/%: AM_CFLAGS = $(GTK_CFLAGS) $(GLADE_CFLAGS) -Wall
src_ui_gui_psppire_LDFLAGS = \
src/ui/gui/%: AM_CFLAGS = $(GTK_CFLAGS) $(GLADE_CFLAGS) -Wall
src_ui_gui_psppire_LDFLAGS = \
@@
-25,6
+16,13
@@
src_ui_gui_psppire_LDADD = \
-lgl -L$(top_builddir)/gl \
@LIBINTL@ @LIBREADLINE@
-lgl -L$(top_builddir)/gl \
@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/psppicon.png \
+ $(top_srcdir)/src/ui/gui/pspplogo.png
+
src_ui_gui_psppire_SOURCES = \
src/ui/gui/customentry.c \
src_ui_gui_psppire_SOURCES = \
src/ui/gui/customentry.c \
@@
-57,7
+55,5
@@
src_ui_gui_psppire_SOURCES = \
src/ui/gui/var-sheet.c \
src/ui/gui/var-sheet.h \
src/ui/gui/var-type-dialog.c \
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/message.c