Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

Fix referencing of headers .. since they're in 'include' only

  • Loading branch information...
commit b3c7d11a91d621797b1e2dff0bdc68dfbfe99640 1 parent a71052e
Zack Moratto zmoratto authored

Showing 1 changed file with 6 additions and 2 deletions. Show diff stats Hide diff stats

  1. +6 2 reformat_isis.py
8 reformat_isis.py
@@ -44,7 +44,9 @@ def write_makefile_am_closing( directory, makefile, all_protoprefixes, CLEANFILE
44 44
45 45
46 46
47   -def write_makefile_am_from_objs_dir_core( directory, moc_generated_files ):
  47 +def write_makefile_am_from_objs_dir_core( directory,
  48 + header_directory,
  49 + moc_generated_files ):
48 50 makefile = open(P.join(directory,'Makefile.am'), 'w')
49 51
50 52 all_protoprefixes = []
@@ -60,8 +62,9 @@ def write_makefile_am_from_objs_dir_core( directory, moc_generated_files ):
60 62 operator_ = "="
61 63 if all_protoprefixes:
62 64 operator = "+="
  65 + print([P.relpath(P.join(header_directory,P.basename(x)+".pb.h"),directory) for x in protoprefixes])
63 66 print('protocol_headers %s %s' %
64   - (operator_,' '.join([P.relpath(x + ".pb.h",directory) for x in protoprefixes])), file=makefile)
  67 + (operator_,' '.join([P.relpath(P.join(header_directory,P.basename(x)+".pb.h"),directory) for x in protoprefixes])), file=makefile)
65 68 print('protocol_sources %s %s\n' %
66 69 (operator_,' '.join([P.relpath(x + ".pb.cc",directory) for x in protoprefixes])), file=makefile)
67 70 all_protoprefixes.extend( protoprefixes )
@@ -319,6 +322,7 @@ def write_makefile_am_from_objs_dir( directory ):
319 322 for plugin in plugins:
320 323 write_makefile_am_from_objs_dir( P.join( opt.destination, 'src', plugin ) )
321 324 write_makefile_am_from_objs_dir_core( P.join( opt.destination, 'src', 'Core' ),
  325 + P.join( opt.destination, 'include' ),
322 326 moc_generated_obj )
323 327
324 328 # Write a makefile for all the apps

0 comments on commit b3c7d11

Please sign in to comment.
Something went wrong with that request. Please try again.