View | Details | Raw Unified | Return to bug 1327
Collapse All | Expand All

(-)a/src/wscript (-5 / +7 lines)
 Lines 79-85    Link Here 
79
        module = bld.new_task_gen(features=['cxx', 'cxxstlib', 'ns3module'])
79
        module = bld.new_task_gen(features=['cxx', 'cxxstlib', 'ns3module'])
80
    else:
80
    else:
81
        module = bld.new_task_gen(features=['cxx', 'cxxshlib', 'ns3module'])
81
        module = bld.new_task_gen(features=['cxx', 'cxxshlib', 'ns3module'])
82
    module.target = '%s/ns3-%s' % (bld.srcnode.relpath_gen(module.path), name)
82
    module.target = '%s/ns%s-%s-%s' % (bld.srcnode.relpath_gen(module.path), wutils.VERSION,
83
                                       name, bld.env['BUILD_PROFILE'])
83
    linkflags = []
84
    linkflags = []
84
    cxxflags = []
85
    cxxflags = []
85
    ccflags = []
86
    ccflags = []
 Lines 123-130    Link Here 
123
124
124
    module.env.append_value("INCLUDES", '#')
125
    module.env.append_value("INCLUDES", '#')
125
126
126
    pcfilegen = bld(features='ns3pcfile')
127
    module.pcfilegen = bld(features='ns3pcfile')
127
    pcfilegen.module = module
128
    module.pcfilegen.module = module
128
    
129
    
129
    return module
130
    return module
130
131
 Lines 378-384    Link Here 
378
            cflags = cflags + self._cflags(dep) + self._cxxflags(dep) + \
379
            cflags = cflags + self._cflags(dep) + self._cxxflags(dep) + \
379
                self._defines(dep) + self._includes(dep)
380
                self._defines(dep) + self._includes(dep)
380
            if dep.startswith('ns3-'):
381
            if dep.startswith('ns3-'):
381
                requires.append("lib"+dep)
382
                dep_name = dep[4:]
383
                requires.append("libns%s-%s-%s" % (wutils.VERSION, dep_name, env['BUILD_PROFILE']))
382
        print >> outfile, """\
384
        print >> outfile, """\
383
prefix=%s
385
prefix=%s
384
libdir=%s
386
libdir=%s
 Lines 404-410    Link Here 
404
@TaskGen.feature('ns3pcfile')
406
@TaskGen.feature('ns3pcfile')
405
@TaskGen.after_method('process_rule')
407
@TaskGen.after_method('process_rule')
406
def apply(self):
408
def apply(self):
407
    output_filename = 'lib%s.pc' % self.module.name
409
    output_filename = 'lib%s.pc' % os.path.basename(self.module.target)
408
    output_node = self.path.find_or_declare(output_filename)
410
    output_node = self.path.find_or_declare(output_filename)
409
    assert output_node is not None, str(self)
411
    assert output_node is not None, str(self)
410
    task = self.create_task('ns3pcfile')
412
    task = self.create_task('ns3pcfile')
(-)a/wscript (+1 lines)
 Lines 320-325    Link Here 
320
        env.append_value('DEFINES', 'NS3_LOG_ENABLE')
320
        env.append_value('DEFINES', 'NS3_LOG_ENABLE')
321
321
322
    env['PLATFORM'] = sys.platform
322
    env['PLATFORM'] = sys.platform
323
    env['BUILD_PROFILE'] = Options.options.build_profile
323
324
324
    if conf.env['CXX_NAME'] in ['gcc', 'icc']:
325
    if conf.env['CXX_NAME'] in ['gcc', 'icc']:
325
        if Options.options.build_profile == 'release': 
326
        if Options.options.build_profile == 'release': 

Return to bug 1327