BuildSystem:

- minor fix for report targets; aggregates were not included after splitting to rules file
- fixed bug where non-darwin platforms caused all rules to be disabled because FEATURE.xcode was erroneously set to 1

git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@2207 b64f7644-9d1e-0410-96f1-a4d463321fa5

diff --git a/make/configure.py b/make/configure.py
index 839077a45d8d23fbbac162356c990513d4d4830a..2f8cf6e008fa37cc6db25f10cd738d0a351b0628 100644 (file)
--- a/make/configure.py
+++ b/make/configure.py
@@ -298,8 +298,10 @@ else:
     archMode = OptionMode( 0, guessHost.machine )
 
 if guessHost.match( '*-*-darwin*' ):
+    d_xcode = True
     d_prefix = '/Applications'
 else: 
+    d_xcode = False
     d_prefix = '/usr/local'
 
 ## create parser
@@ -315,8 +317,9 @@ group.add_option( '', '--prefix', default=d_prefix, action='store',
 parser.add_option_group( group )
 
 group = OptionGroup( parser, 'Feature Options' )
-group.add_option( '', '--disable-xcode', default=False, action='store_true',
-    help='disable Xcode (Darwin only)' )
+if d_xcode:
+    group.add_option( '', '--disable-xcode', default=False, action='store_true',
+        help='disable Xcode (Darwin only)' )
 group.add_option( '', '--disable-gtk', default=False, action='store_true',
     help='disable GTK GUI (Linux only)' )
 parser.add_option_group( group )
@@ -678,7 +681,7 @@ config.add( 'INSTALL.prefix', options.prefix )
 config.add( 'INSTALL.prefix/', '$(INSTALL.prefix)/' )
 
 config.addBlank()
-config.add( 'FEATURE.xcode', 0 if options.disable_xcode else 1 )
+config.add( 'FEATURE.xcode', 0 if not hasattr(options, 'disable_xcode') or options.disable_xcode else 1 )
 config.add( 'FEATURE.gtk',   0 if options.disable_gtk   else 1 )
 
 config.addMake( '' )

diff --git a/make/include/main.rules b/make/include/main.rules
index 1f996cdc56c068cc1a9fad1e500940daa64ffca7..e7511a263ec0a21cae9ba78c200faf9269645e95 100644 (file)
--- a/make/include/main.rules
+++ b/make/include/main.rules
@@ -29,6 +29,8 @@ mrproper: xclean
 
 ###############################################################################
 
+include $(PROJECT/)make/include/base.rules
+
 include $(MODULES:%=$(PROJECT/)%/module.rules)
 -include $(PROJECT/)make/variant/$(HOST.system).rules
 -include $(PROJECT/)make/variant/$(HOST.system).$(BUILD.machine).rules