From: Enrico Forestieri <forenr@lyx.org>
Date: Wed, 12 Dec 2007 19:37:40 +0000 (+0000)
Subject: Restore scons and autotools support for moc files in src/support
X-Git-Tag: 1.6.10~6957
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=430a2c1adbe7b2facce86c1fbf827a93fb699297;p=features.git

Restore scons and autotools support for moc files in src/support
taken out in r22101.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@22105 a592a061-630c-0410-9148-cb99ea01b6c8
---

diff --git a/development/scons/SConstruct b/development/scons/SConstruct
index f4c71d1f44..ee93246cf5 100644
--- a/development/scons/SConstruct
+++ b/development/scons/SConstruct
@@ -1499,6 +1499,11 @@ if (included_gettext and not libExists('included_intl')) or 'intl' in BUILD_TARG
 #
 # src/support
 #
+frontend_env['QT4_MOCHPREFIX'] = ''
+frontend_env['QT4_MOCHSUFFIX'] = '_moc.cpp'
+
+support_moced_files = [frontend_env.Moc4('$BUILDDIR/src/support/%s' % x)
+    for x in src_support_header_files ]
 support = frontend_env.StaticLibrary(
     target = '$LOCALLIBPATH/support',
     source = ['$BUILDDIR/src/support/%s' % x for x in src_support_files] + \
@@ -1511,7 +1516,7 @@ support = frontend_env.StaticLibrary(
         '-DQT_NO_STL',
         '-DQT_NO_KEYWORDS',
     ],
-    CPPPATH = ['$CPPPATH', '$TOP_SRCDIR/src/support/minizip']
+    CPPPATH = ['$CPPPATH', '$BUILDDIR/src/support', '$TOP_SRCDIR/src/support/minizip']
 )
 Alias('support', support)
 
@@ -1559,9 +1564,6 @@ Alias('graphics', graphics)
 #
 # src/frontend/qt4
 #
-frontend_env['QT4_MOCHPREFIX'] = ''
-frontend_env['QT4_MOCHSUFFIX'] = '_moc.cpp'
-
 # tells scons how to get these moced files, although not all moced files are needed
 # (or are actually generated).
 qt4_moced_files = [frontend_env.Moc4('$BUILDDIR/src/frontends/qt4/%s' % x)
diff --git a/src/support/Makefile.am b/src/support/Makefile.am
index 3e69f53f00..e35f66abe0 100644
--- a/src/support/Makefile.am
+++ b/src/support/Makefile.am
@@ -12,6 +12,24 @@ liblyxsupport_la_LDFLAGS = $(QT4_CORE_LDFLAGS)
 
 BUILT_SOURCES = $(PCH_FILE)
 
+#########################  Qt stuff  #############################
+#
+
+CLEANFILES += $(MOCEDFILES)
+BUILT_SOURCES += $(MOCEDFILES)
+
+MOCEDFILES = $(MOCHEADER:%.h=%_moc.cpp)
+
+%_moc.cpp: %.h
+	$(MOC4) -o $@ $<
+
+MOCHEADER =
+
+liblyxsupport_la_DEPENDENCIES = $(MOCEDFILES)
+
+#
+##################################################################
+
 AM_CPPFLAGS += $(PCH_FLAGS) -I$(srcdir)/.. $(BOOST_INCLUDES)
 AM_CPPFLAGS += $(QT4_CPPFLAGS) $(QT4_CORE_INCLUDES) -I$(srcdir)/minizip