From 5c7cf1cc5358d137160be1619981e7eea9a7402f Mon Sep 17 00:00:00 2001 From: Dave Wallace Date: Tue, 24 Oct 2017 04:12:18 -0400 Subject: VCL-LDPRELOAD: statically link vppcom into libvcl-ldpreload.so - Move VCL & VCL-LDPRELOAD source into src/vcl - Statically link vppcom into libvcl-ldpreload.so Change-Id: I778300b37e8b06640d9dbc01caf297edf7a6edb7 Signed-off-by: Dave Wallace --- extras/vcl-ldpreload/src/Makefile.am | 62 ------------------------------------ 1 file changed, 62 deletions(-) delete mode 100644 extras/vcl-ldpreload/src/Makefile.am (limited to 'extras/vcl-ldpreload/src/Makefile.am') diff --git a/extras/vcl-ldpreload/src/Makefile.am b/extras/vcl-ldpreload/src/Makefile.am deleted file mode 100644 index a1317696678..00000000000 --- a/extras/vcl-ldpreload/src/Makefile.am +++ /dev/null @@ -1,62 +0,0 @@ -# Copyright (c) 2016 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. - -############################################################################### -# Global Defines -############################################################################### - -AUTOMAKE_OPTIONS = foreign subdir-objects -ACLOCAL_AMFLAGS = -I m4 -AM_LIBTOOLFLAGS = --quiet - -AM_CFLAGS = -Wall -fstack-protector -fPIC -Werror -g -DFORTIFY_SOURCE=2 -AM_LDFLAGS = -shared - -if VPP_DEBUG -AM_CFLAGS += -O0 -DCLIB_DEBUG -vpp_build = vpp_debug-native -else -AM_CFLAGS += -O2 -vpp_build = vpp-native -endif - -if VCL_LDPRELOAD_DEBUG -AM_CFLAGS += -ggdb '-DVCOM_DEBUG=1' -else -AM_CFLAGS += -Wall '-DVCOM_DEBUG=0' -endif - -if VPP_DIR_SET -vpp_install_dir = @VPP_DIR@/build-root/install-$(vpp_build)/vpp -AM_CFLAGS += -I$(vpp_install_dir)/include/ -AM_LDFLAGS += -L$(vpp_install_dir)/lib64/ -endif - - -AM_LDFLAGS += -lvppcom -lvppinfra - -SUBDIRS = . -noinst_HEADERS = -dist_bin_SCRIPTS = -lib_LTLIBRARIES = -BUILT_SOURCES = -CLEANFILES = - - -############################################################################### -# Components -############################################################################### - -include libvcl-ldpreload.am - - -- cgit 1.2.3-korg