# HG changeset patch # User John W. Eaton # Date 1367128143 14400 # Node ID 02a90cb9d79f5a95656541cf6068a77561338f81 # Parent 2754c5fd6ae0d5ca9ca7e4394304c9c45b503fae include config.h in MOC files * libgui/Makefile.am (moc-command): New macro. (moc-%.cc: %.h): Use it. diff -r 2754c5fd6ae0 -r 02a90cb9d79f libgui/Makefile.am --- a/libgui/Makefile.am Sun Apr 28 01:21:16 2013 -0400 +++ b/libgui/Makefile.am Sun Apr 28 01:49:03 2013 -0400 @@ -86,8 +86,16 @@ default-qt-settings: default-qt-settings.in $(do_subst_qt_settings) +define moc-command +( echo '#ifdef HAVE_CONFIG_H'; \ + echo '#include '; \ + echo '#endif'; \ + $(MOC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(MOC_CPPFLAGS) $(liboctgui_la_CPPFLAGS) $< ) > $@-t +mv $@-t $@ +endef + moc-%.cc: %.h - $(MOC) -o$@ $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(MOC_CPPFLAGS) $(liboctgui_la_CPPFLAGS) $< + $(moc-command) ui-%.h: %.ui $(UIC) -o $@ $<