aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDamjan Marion <damarion@cisco.com>2018-05-30 09:55:05 +0200
committerFlorin Coras <florin.coras@gmail.com>2018-05-31 00:02:24 +0000
commitc0c919c6fa721a564a08b367b839efc802d4c963 (patch)
tree4351ba413425408bfb3da0e7d15ae6b7e7eef8ac
parent40c6e1d8e091fe8ac81f3907c035a121a6129019 (diff)
Add src/vlib/config.h.in template
Change-Id: I9b81dcb9250cab09b88f161366da9475a7ee5dd6 Signed-off-by: Damjan Marion <damarion@cisco.com>
-rw-r--r--.gitignore1
-rw-r--r--src/configure.ac9
-rw-r--r--src/vlib.am5
-rw-r--r--src/vlib/config.h.in21
4 files changed, 29 insertions, 7 deletions
diff --git a/.gitignore b/.gitignore
index 98a29153fd2..04a3b91d6ca 100644
--- a/.gitignore
+++ b/.gitignore
@@ -36,7 +36,6 @@ aclocal.m4
app.info
compile
config.h
-config.h.in
config.log
config.guess
config.sub
diff --git a/src/configure.ac b/src/configure.ac
index 2d12090aaf1..f6ec44bb769 100644
--- a/src/configure.ac
+++ b/src/configure.ac
@@ -3,7 +3,14 @@ LT_INIT
AC_CONFIG_AUX_DIR([.])
AM_INIT_AUTOMAKE([subdir-objects])
AM_SILENT_RULES([yes])
-AC_CONFIG_FILES([Makefile plugins/Makefile vpp-api/python/Makefile vpp-api/java/Makefile vpp-api/vapi/Makefile])
+AC_CONFIG_FILES([ \
+ Makefile \
+ plugins/Makefile \
+ vpp-api/python/Makefile \
+ vpp-api/java/Makefile \
+ vpp-api/vapi/Makefile \
+ vlib/config.h \
+])
AC_CONFIG_MACRO_DIR([m4])
AC_PROG_CC
diff --git a/src/vlib.am b/src/vlib.am
index 55d6e65c2b9..b1e6bbe844a 100644
--- a/src/vlib.am
+++ b/src/vlib.am
@@ -16,11 +16,6 @@ lib_LTLIBRARIES += libvlib.la
libvlib_la_LIBADD = libvppinfra.la -ldl -lpthread
libvlib_la_DEPENDENCIES = libvppinfra.la
-BUILT_SOURCES += vlib/config.h
-
-vlib/config.h:
- @echo "#define __PRE_DATA_SIZE" @PRE_DATA_SIZE@ > $@
-
libvlib_la_SOURCES = \
vlib/buffer.c \
vlib/buffer_serialize.c \
diff --git a/src/vlib/config.h.in b/src/vlib/config.h.in
new file mode 100644
index 00000000000..a24cb848b82
--- /dev/null
+++ b/src/vlib/config.h.in
@@ -0,0 +1,21 @@
+/*
+ * 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_vlib_config_h
+#define included_vlib_config_h
+
+#define __PRE_DATA_SIZE @PRE_DATA_SIZE@
+
+#endif