Changeset 1154 for trunk/libffado/support
- Timestamp:
- 05/10/08 08:39:39 (16 years ago)
- Files:
-
- trunk/libffado/support/dbus/SConscript (modified) (1 diff)
- trunk/libffado/support/firmware/SConscript (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/libffado/support/dbus/SConscript
r864 r1154 36 36 if not env.GetOption( "clean" ): 37 37 env.MergeFlags( env["DBUS1_FLAGS"] ) 38 env.MergeFlags( env['LIBRAW1394_FLAGS'] ) 39 env.MergeFlags( env['LIBXML26_FLAGS'] ) 38 if not env['SERIALIZE_USE_EXPAT']: 39 env.MergeFlags( env['LIBXML26_FLAGS'] ) 40 else: 41 env.PrependUnique( LIBS=["expat"] ) 40 42 41 43 env.Xml2Cpp_Proxy('controlclient-glue.h', 'control-interface.xml') trunk/libffado/support/firmware/SConscript
r900 r1154 33 33 env.MergeFlags( env['LIBAVC1394_FLAGS'] ) 34 34 env.MergeFlags( env['LIBIEC61883_FLAGS'] ) 35 env.MergeFlags( env['LIBXML26_FLAGS'] ) 35 if not env['SERIALIZE_USE_EXPAT']: 36 env.MergeFlags( env['LIBXML26_FLAGS'] ) 37 else: 38 env.PrependUnique( LIBS=["expat"] ) 36 39 37 40 static_env = env.Copy()