Merge remote-tracking branch 'origin/master' into sheet

[pspp] / src / ui / gui / automake.mk

diff --git a/src/ui/gui/automake.mk b/src/ui/gui/automake.mk
index 99ba25df011e6d6a848dfd3cfe78af64de661a3f..1155cf70db779a1b41dd91f9f030b1e9bdc3bd91 100644 (file)
--- a/src/ui/gui/automake.mk
+++ b/src/ui/gui/automake.mk
@@ -69,6 +69,7 @@ EXTRA_DIST += \
        src/ui/gui/marshaller-list \
        src/ui/gui/pspplogo.svg
 
+src_ui_gui_psppire_CPPFLAGS=
 
 if HAVE_GUI
 bin_PROGRAMS += src/ui/gui/psppire 
@@ -241,6 +242,10 @@ src_ui_gui_psppire_SOURCES = \
        src/ui/gui/psppire-dialog-action-rank.h \
        src/ui/gui/psppire-dialog-action-recode.c \
        src/ui/gui/psppire-dialog-action-recode.h \
+       src/ui/gui/psppire-dialog-action-recode-same.c \
+       src/ui/gui/psppire-dialog-action-recode-same.h \
+       src/ui/gui/psppire-dialog-action-recode-different.c \
+       src/ui/gui/psppire-dialog-action-recode-different.h \
        src/ui/gui/psppire-dialog-action-regression.c \
        src/ui/gui/psppire-dialog-action-regression.h \
        src/ui/gui/psppire-dialog-action-reliability.c \
@@ -392,7 +397,7 @@ installcheck-local:
        DISPLAY=/invalid/port $(MAKE) $(AM_MAKEFLAGS) installcheck-binPROGRAMS
 
 # <gtk/gtk.h> wrapper
-src_ui_gui_psppire_CPPFLAGS = $(AM_CPPFLAGS) -Isrc/ui/gui/include
+src_ui_gui_psppire_CPPFLAGS += $(AM_CPPFLAGS) -Isrc/ui/gui/include
 BUILT_SOURCES += src/ui/gui/include/gtk/gtk.h
 src/ui/gui/include/gtk/gtk.h: src/ui/gui/include/gtk/gtk.in.h
        @$(MKDIR_P) src/ui/gui/include/gtk