Extend the build to include new sheet files
authorJohn Darrington <john@darrington.wattle.id.au>
Fri, 18 Mar 2016 18:08:36 +0000 (19:08 +0100)
committerJohn Darrington <john@darrington.wattle.id.au>
Fri, 18 Mar 2016 18:08:36 +0000 (19:08 +0100)
src/ui/gui/automake.mk
src/ui/gui/efficient-sheet.mk

index 99ba25df011e6d6a848dfd3cfe78af64de661a3f..2d6862857ccd43be94a619d997a779c284f7d28d 100644 (file)
@@ -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
 
 # <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
index b668fa3193af76fb56866c7f9e022996299277b3..c2512ad73c61b05898e1914df38c2b9f27a0eaf3 100644 (file)
@@ -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 $< > $@
+