diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2017-08-08 20:45:48 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-08-08 20:45:48 +0200 |
| commit | cb2bea59ab06ed4e1887c2bb86b04653dd0fee05 (patch) | |
| tree | 28fff159e3df85a2ca978efabf38a603d244dbf5 | |
| parent | ce3a3daedf345bb04bc474ff7ae0cbe6abd8820e (diff) | |
| parent | 559c94d52e76a334dc90f082f4bce256d82811da (diff) | |
| download | ATCD-cb2bea59ab06ed4e1887c2bb86b04653dd0fee05.tar.gz | |
Merge pull request #473 from jwillemsen/jwi-automakecleanup
Cleanup old automake support
| -rw-r--r-- | ACE/ACE.mwc | 3 | ||||
| -rw-r--r-- | TAO/tests/TransportCurrent/IIOP/IIOP.mpc | 9 |
2 files changed, 2 insertions, 10 deletions
diff --git a/ACE/ACE.mwc b/ACE/ACE.mwc index d1781a285a0..7899541b3e2 100644 --- a/ACE/ACE.mwc +++ b/ACE/ACE.mwc @@ -1,7 +1,4 @@ workspace { - exclude(automake) { - build - } exclude { TAO } diff --git a/TAO/tests/TransportCurrent/IIOP/IIOP.mpc b/TAO/tests/TransportCurrent/IIOP/IIOP.mpc index e96ab5a8bc5..34b36a5e640 100644 --- a/TAO/tests/TransportCurrent/IIOP/IIOP.mpc +++ b/TAO/tests/TransportCurrent/IIOP/IIOP.mpc @@ -20,13 +20,8 @@ project(*Server): taoserver, tc_iiop, pi_server { project(*Client): taoclient, tc_iiop, dynamicinterface, pi_server { after += *Server Current_Test_Lib_Client Current_Test_Lib_Server libs += Current_Test_Lib_Client Current_Test_Lib_Server - - specific (automake) { - includes += $(srcdir)/../lib ../lib - } else { - includes += . ../lib - libpaths += ../lib - } + includes += . ../lib + libpaths += ../lib Source_Files { IIOP_Tester.cpp |