diff options
| author |   Neale Ranns <nranns@cisco.com> | 2018-07-23 05:05:48 -0400 |
|---|---|---|
| committer |   Damjan Marion <dmarion@me.com> | 2018-07-25 21:46:26 +0000 |
| commit | 3451d98550228b9742e8ff4577dd4a1ee6791efc (patch) | |
| tree | 5760439ab5e795b50a44b4328b7090721ef07fd8 | |
| parent | 605afa0cd959a1687aa4261215e9685d93b122f1 (diff) | |
Generate vppinfra/config.h from config.in script (same as we do for vlib/config.h)
Change-Id: I55549b589e34a62d3704f788fce801392de22f46
Signed-off-by: Neale Ranns <nranns@cisco.com>
| -rw-r--r-- | src/configure.ac | 1 | ||||
| -rw-r--r-- | src/vppinfra.am | 11 | ||||
| -rw-r--r-- | src/vppinfra/config.h.in | 23 |
3 files changed, 24 insertions, 11 deletions
diff --git a/src/configure.ac b/src/configure.ac index 73e5f9ad31b..fb7ae8128aa 100644 --- a/src/configure.ac +++ b/src/configure.ac @@ -10,6 +10,7 @@ AC_CONFIG_FILES([ \ vpp-api/java/Makefile \ vpp-api/vapi/Makefile \ vlib/config.h \ + vppinfra/config.h \ ]) AC_CONFIG_MACRO_DIR([m4]) diff --git a/src/vppinfra.am b/src/vppinfra.am index 7641c71a2a5..840ce27fb5a 100644 --- a/src/vppinfra.am +++ b/src/vppinfra.am @@ -13,17 +13,6 @@ lib_LTLIBRARIES += libvppinfra.la -BUILT_SOURCES += vppinfra/config.h - -vppinfra/config.h: - @echo "/** Autogenerated by Autotools **/" > $@ - @echo "#ifndef included_clib_config_h" >> $@ - @echo "#define included_clib_config_h" >> $@ - @echo "#ifndef CLIB_LOG2_CACHE_LINE_BYTES " >> $@ - @echo "#define CLIB_LOG2_CACHE_LINE_BYTES " @LOG2_CACHE_LINE_BYTES@ >> $@ - @echo "#endif " >> $@ - @echo "#endif " >> $@ - TESTS = if ENABLE_TESTS diff --git a/src/vppinfra/config.h.in b/src/vppinfra/config.h.in new file mode 100644 index 00000000000..0947c7166f0 --- /dev/null +++ b/src/vppinfra/config.h.in @@ -0,0 +1,23 @@ +/* + * Copyright (c) 2018 Cisco and/or its affiliates. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at: + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#ifndef included_clib_config_h +#define included_clib_config_h + +#ifndef CLIB_LOG2_CACHE_LINE_BYTES +#define CLIB_LOG2_CACHE_LINE_BYTES @LOG2_CACHE_LINE_BYTES@ +#endif + +#endif |