From df177faaaf2513e77d0b381524edeede0d2a3450 Mon Sep 17 00:00:00 2001 From: John Darrington Date: Fri, 18 Mar 2016 19:08:36 +0100 Subject: [PATCH] Extend the build to include new sheet files --- src/ui/gui/automake.mk | 3 ++- src/ui/gui/efficient-sheet.mk | 20 ++++++++++++++++++++ 2 files changed, 22 insertions(+), 1 deletion(-) diff --git a/src/ui/gui/automake.mk b/src/ui/gui/automake.mk index 99ba25df01..2d6862857c 100644 --- 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 @@ -392,7 +393,7 @@ installcheck-local: DISPLAY=/invalid/port $(MAKE) $(AM_MAKEFLAGS) installcheck-binPROGRAMS # 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 diff --git a/src/ui/gui/efficient-sheet.mk b/src/ui/gui/efficient-sheet.mk index b668fa3193..c2512ad73c 100644 --- a/src/ui/gui/efficient-sheet.mk +++ b/src/ui/gui/efficient-sheet.mk @@ -7,3 +7,23 @@ src_ui_gui_psppire_SOURCES += \ src/ui/gui/efficient-sheet/jmd-sheet-single.c \ src/ui/gui/efficient-sheet/jmd-datum.c \ src/ui/gui/efficient-sheet/jmd-cell.c + + +nodist_src_ui_gui_psppire_SOURCES += \ + src/ui/gui/efficient-sheet/jmd-marshaller.c \ + src/ui/gui/efficient-sheet/jmd-marshaller.h + +src_ui_gui_psppire_CPPFLAGS+=-Isrc/ui/gui/efficient-sheet + + + +BUILT_SOURCES += \ + src/ui/gui/efficient-sheet/jmd-marshaller.c \ + src/ui/gui/efficient-sheet/jmd-marshaller.h + +src/ui/gui/efficient-sheet/jmd-marshaller.c: src/ui/gui/efficient-sheet/marshall-list + glib-genmarshal --body --prefix=jmd_cclosure_marshal $< > $@ + +src/ui/gui/efficient-sheet/jmd-marshaller.h: src/ui/gui/efficient-sheet/marshall-list + glib-genmarshal --header --prefix=jmd_cclosure_marshal $< > $@ + -- 2.30.2