diff options
| -rw-r--r-- | src/client/wscript | 3 | ||||
| -rw-r--r-- | src/gui/wscript | 3 | ||||
| -rw-r--r-- | src/serialisation/wscript | 3 | ||||
| -rw-r--r-- | src/server/wscript | 3 | ||||
| -rw-r--r-- | src/shared/wscript | 3 | ||||
| -rw-r--r-- | wscript | 5 |
6 files changed, 3 insertions, 17 deletions
diff --git a/src/client/wscript b/src/client/wscript index 9da924ec..9466300e 100644 --- a/src/client/wscript +++ b/src/client/wscript @@ -2,9 +2,6 @@ from waflib.extras import autowaf as autowaf def build(bld): - # Headers - bld.install_files('${INCLUDEDIR}/ingen/client', bld.path.ant_glob('*.hpp')) - obj = bld(features = 'cxx cxxshlib') obj.source = ''' ClientStore.cpp diff --git a/src/gui/wscript b/src/gui/wscript index 43a96904..dd9c4770 100644 --- a/src/gui/wscript +++ b/src/gui/wscript @@ -3,9 +3,6 @@ from waflib.extras import autowaf as autowaf import waflib.Utils as Utils def build(bld): - # Headers - bld.install_files('${INCLUDEDIR}/ingen/gui', bld.path.ant_glob('*.hpp')) - obj = bld(features = 'cxx cxxshlib') obj.source = ''' App.cpp diff --git a/src/serialisation/wscript b/src/serialisation/wscript index 69b457fb..1fbe8e12 100644 --- a/src/serialisation/wscript +++ b/src/serialisation/wscript @@ -2,9 +2,6 @@ from waflib.extras import autowaf as autowaf def build(bld): - # Headers - bld.install_files('${INCLUDEDIR}/ingen/serialisation', bld.path.ant_glob('*.hpp')) - obj = bld(features = 'cxx cxxshlib') obj.source = ''' Parser.cpp diff --git a/src/server/wscript b/src/server/wscript index 1ce147d2..79a3e6e7 100644 --- a/src/server/wscript +++ b/src/server/wscript @@ -2,9 +2,6 @@ from waflib.extras import autowaf as autowaf def build(bld): - # Headers - bld.install_files('${INCLUDEDIR}/ingen/server', bld.path.ant_glob('*.hpp')) - core_source = ''' AudioBuffer.cpp BufferFactory.cpp diff --git a/src/shared/wscript b/src/shared/wscript index 3bff61bb..51b7b5a5 100644 --- a/src/shared/wscript +++ b/src/shared/wscript @@ -2,9 +2,6 @@ from waflib.extras import autowaf as autowaf def build(bld): - # Headers - bld.install_files('${INCLUDEDIR}/ingen/shared', bld.path.ant_glob('*.hpp')) - obj = bld(features = 'cxx cxxshlib') obj.source = ''' Builder.cpp @@ -122,8 +122,9 @@ def build(bld): opts.moduledir = opts.moduledir or bld.env['PREFIX'] + 'lib/ingen' # Headers - bld.install_files('${INCLUDEDIR}/ingen', - bld.path.ant_glob('include/ingen/*.hpp')) + for i in ['client', 'serialisation']: + bld.install_files('${INCLUDEDIR}/ingen/%s' % i, + bld.path.ant_glob('include/ingen/%s/*' % i)) # Modules bld.recurse('src/client') |