[Lprof-devel] lprof SConstruct,1.5,1.6

[Hal E. <hv...@us...>]

Update of /cvsroot/lprof/lprof
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16241

Modified Files:
	SConstruct 
Log Message:
Request #1318880 stream line and consolidate scons by moving non-platform specific code to the SContruct file

Index: SConstruct
===================================================================
RCS file: /cvsroot/lprof/lprof/SConstruct,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** SConstruct	23 Nov 2005 21:24:34 -0000	1.5
--- SConstruct	25 Nov 2005 01:38:58 -0000	1.6
***************
*** 26,29 ****
--- 26,30 ----
  
  # setup the include paths where qt, lcms and liblprof should live
+ env.Append(QTDIR=os.environ['QTDIR'])
  env.Append(CPPPATH=include_search_path)
  env.Append(LIBS=['m', 'png', 'tiff', 'lcms', 'Xext', 'X11', 'qassistantclient'])
***************
*** 55,61 ****
  Default(os.path.join(target_dir,target_name2))
  
  # this sets up an alias that will compile icc2it8
  env.Alias('icc2it8', target_dir + '/ICCtoIT8') 
  
! # set up alias for liblprof
! # env.Alias('liblprof',target_dir + '/liblprof')
--- 56,81 ----
  Default(os.path.join(target_dir,target_name2))
  
+ print target_dir
+ 
  # this sets up an alias that will compile icc2it8
  env.Alias('icc2it8', target_dir + '/ICCtoIT8') 
  
! icon_files = env.Install(idir_data + '/data/icons/', '#data/icons/lprof.png')
! env.Alias('install', icon_files);
! 
! desktop_files = env.Install(idir_data + '/data/desktop', '#data/desktop/lprof.desktop')
! env.Alias('install', desktop_files)
! 
! pic_files = env.Install(idir_data + '/data/pics', ['#data/pics/grayscale.tif', '#data/pics/monitor patches.tif', '#data/pics/MonitorTemplate.it8', '#data/pics/party_4s.png', '#data/pics/scandmo.png', '#data/pics/srgb.it8'] )
! env.Alias('install', pic_files)
! 
! profiles = env.Install(idir_data + '/data/profiles', ['#data/profiles/CIEE.icm', '#data/profiles/scandmo.icm', '#data/profiles/sRGB Color Space Profile.icm'] )
! env.Alias('install', profiles)
! 
! templates = env.Install(idir_data + '/data/template', ['#data/template/IT8_19.ITX', '#data/template/IT8_22.ITX', '#data/template/KODAK.ITX'] )
! env.Alias('install', templates)
! 
! help_files = env.Install(idir_data + '/data/help', ['#data/help/lprof-help.html', '#data/help/about.txt', '#data/help/checker.html', '#data/help/gamma.html', '#data/help/handbook.png', '#data/help/inst-ref.html', '#data/help/lprof.png', '#data/help/lprof-help.adp', '#data/help/mon-val.html', '#data/help/monitor.html', '#data/help/preferences.html', '#data/help/profile-id.html', '#data/help/profile-parms.html', '#data/help/corner.jpg', '#data/help/ufraw.html', '#data/help/ufraw-1.jpg', '#data/help/ufraw-2.jpg', '#data/help/ufraw-3.jpg'] )
! env.Alias('install', help_files)
! 
! env.Clean('install', idir_data)