From: <tr...@ff...> - 2007-12-23 21:31:08
|
Author: arnonym Date: 2007-12-23 13:31:14 -0800 (Sun, 23 Dec 2007) New Revision: 771 Modified: trunk/libffado/SConstruct trunk/libffado/src/SConscript Log: Almost too easy! Fix the dependency libffado.* -> config.h -> config.h.in -> SConstruct Modified: trunk/libffado/SConstruct =================================================================== --- trunk/libffado/SConstruct 2007-12-23 21:25:31 UTC (rev 770) +++ trunk/libffado/SConstruct 2007-12-23 21:31:14 UTC (rev 771) @@ -318,8 +318,7 @@ # env.ScanReplace( "config.h.in" ) # ensure that the config.h is updated with the version -NoCache("config.h") -AlwaysBuild("config.h") +env.Depends( "config.h", "SConstruct" ) pkgconfig = env.ScanReplace( "libffado.pc.in" ) env.Install( env['libdir'] + '/pkgconfig', pkgconfig ) Modified: trunk/libffado/src/SConscript =================================================================== --- trunk/libffado/src/SConscript 2007-12-23 21:25:31 UTC (rev 770) +++ trunk/libffado/src/SConscript 2007-12-23 21:31:14 UTC (rev 771) @@ -171,15 +171,7 @@ libstreaming/amdtp/AmdtpTransmitStreamProcessor.cpp \ ' ) -# Explicitly make these files dependent on config.h -# to make sure they contain the most recent version -# #define's -version_dependent_files = [ - "ffado.os", # external API versioning - "libutil/serialize.os", # cache versioning - ] - source = ffado_source pkgdata = [] if env['ENABLE_BEBOB']: @@ -227,15 +219,6 @@ if libenv['BUILD_STATIC_LIB']: ffadolib_static = libenv.StaticLibrary( "ffado", source ) -for file in version_dependent_files: - Depends(file, '#/config.h') - NoCache(file) - AlwaysBuild(file) - -# FIXME: there has to be a better way -AlwaysBuild(ffadolib) -NoCache(ffadolib) - # # All the following tries to emulate the versioning of installed libs as seen from libtool... # |