Use which to find ulp files when compiling examples

'configure' set default target installation directory is '/usr/local/bin/ulp', at the same time, ulp could be installed to '/usr/bin/', thus, we should find ulp in examples/*/Makefile, it's better way. Signed-off-by: Rong Tao <[email protected]>
SUSE · Oct 13, 2023 · fcafc96 · fcafc96
1 parent f1faf19
commit fcafc96
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 5 deletions.
diff --git a/examples/cplusplus/1-class/Makefile b/examples/cplusplus/1-class/Makefile
@@ -1,8 +1,12 @@
 CXX=g++
 CXXFLAGS=-O2 -fpatchable-function-entry=16,14 -fPIC -g3
-ULP=/usr/bin/ulp
+ULP=$(shell which ulp 2>/dev/null)
 LDFLAGS=
 
+ifeq ($(ULP),)
+$(error Not found ulp, please make install first)
+endif
+
 all: test a_livepatch1.so
 
 test: class.o

diff --git a/examples/cplusplus/2-private_class/Makefile b/examples/cplusplus/2-private_class/Makefile
@@ -1,8 +1,12 @@
 CXX=g++
 CXXFLAGS=-O2 -fpatchable-function-entry=16,14 -fdump-ipa-clones -fPIC -g3
-ULP=/usr/bin/ulp
+ULP=$(shell which ulp 2>/dev/null)
 LDFLAGS=
 
+ifeq ($(ULP),)
+$(error Not found ulp, please make install first)
+endif
+
 all: test a_livepatch1.so
 
 test: class.o

diff --git a/examples/cplusplus/3-indirect_call/Makefile b/examples/cplusplus/3-indirect_call/Makefile
@@ -1,8 +1,12 @@
 CXX=g++
 CXXFLAGS=-O2 -fpatchable-function-entry=16,14 -fdump-ipa-clones -fPIC -g3
-ULP=/usr/bin/ulp
+ULP=$(shell which ulp 2>/dev/null)
 LDFLAGS=
 
+ifeq ($(ULP),)
+$(error Not found ulp, please make install first)
+endif
+
 all: test a_livepatch1.so
 
 test: class.o

diff --git a/examples/cplusplus/4-global_var/Makefile b/examples/cplusplus/4-global_var/Makefile
@@ -1,8 +1,12 @@
 CXX=g++
 CXXFLAGS=-O2 -fpatchable-function-entry=16,14 -fdump-ipa-clones -fPIC -g3
-ULP=/usr/bin/ulp
+ULP=$(shell which ulp 2>/dev/null)
 LDFLAGS=
 
+ifeq ($(ULP),)
+$(error Not found ulp, please make install first)
+endif
+
 all: test a_livepatch1.so
 
 test: test.o

diff --git a/examples/cplusplus/5-queue/Makefile b/examples/cplusplus/5-queue/Makefile
@@ -1,8 +1,12 @@
 CXX=g++
 CXXFLAGS=-fpatchable-function-entry=16,14 -fdump-ipa-clones -fPIC -g3 -Wno-terminate -O2
-ULP=/usr/bin/ulp
+ULP=$(shell which ulp 2>/dev/null)
 LDFLAGS=
 
+ifeq ($(ULP),)
+$(error Not found ulp, please make install first)
+endif
+
 all: test a_livepatch1.so
 
 test: class.o