[libblockdev 10/10] Leave out link-time flags when compiling.

mulhern amulhern at redhat.com
Wed Jun 25 21:35:39 UTC 2014


Signed-off-by: mulhern <amulhern at redhat.com>
---
 Makefile | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/Makefile b/Makefile
index 331d1dc..0bec653 100644
--- a/Makefile
+++ b/Makefile
@@ -6,21 +6,23 @@ LOOP_PLUGIN_FILES = src/plugins/loop.h src/plugins/loop.c
 CRYPTO_PLUGIN_FILES = src/plugins/crypto.h src/plugins/crypto.c
 LIBRARY_FILES = src/lib/blockdev.c src/lib/blockdev.h src/lib/plugins.h
 PLUGIN_SOURCE_FILES = $(addprefix src/lib/plugin_apis/, $(addsuffix .c, ${PLUGINS}))
+GLIB_INCLUDES = `pkg-config --cflags glib-2.0`
+GOBJECT_INCLUDES = `pkg-config --cflags gobject-2.0`
+LIBCRYPTSETUP_INCLUDES = `pkg-config --cflags libcryptsetup`
+
 
 build-plugins: ${LVM_PLUGIN_FILES} ${SWAP_PLUGIN_FILES} ${LOOP_PLUGIN_FILES} ${SIZES_FILES}
-	gcc -c -Wall -Wextra -fPIC -I src/utils/ -I src/plugins/ -lm `pkg-config --libs --cflags glib-2.0 gobject-2.0`\
+	gcc -c -Wall -Wextra -fPIC -I src/utils/ -I src/plugins/ ${GLIB_INCLUDES} ${GOBJECT_INCLUDES} \
 		src/utils/sizes.c src/plugins/lvm.c
 	gcc -shared -o src/plugins/libbd_lvm.so lvm.o
 
-	gcc -c -Wall -Wextra -fPIC -I src/plugins/ -lm `pkg-config --libs --cflags glib-2.0`\
-		src/plugins/swap.c
+	gcc -c -Wall -Wextra -fPIC -I src/plugins/ ${GLIB_INCLUDES} src/plugins/swap.c
 	gcc -shared -o src/plugins/libbd_swap.so swap.o
 
-	gcc -c -Wall -Wextra -fPIC -I src/plugins/ -lm `pkg-config --libs --cflags glib-2.0`\
-		src/plugins/loop.c
+	gcc -c -Wall -Wextra -fPIC -I src/plugins/ ${GLIB_INCLUDES} src/plugins/loop.c
 	gcc -shared -o src/plugins/libbd_loop.so loop.o
 
-	gcc -c -Wall -Wextra -fPIC -I src/plugins/ -lm `pkg-config --libs --cflags glib-2.0 libcryptsetup`\
+	gcc -c -Wall -Wextra -fPIC -I src/plugins/ ${GLIB_INCLUDES} ${LIBCRYPTSETUP_INCLUDES} \
 		src/plugins/crypto.c
 	gcc -shared -o src/plugins/libbd_crypto.so crypto.o
 
@@ -28,11 +30,11 @@ src/lib/plugin_apis/%.c: src/lib/plugin_apis/%.h
 	./boilerplate_generator.py $< > $@
 
 src/lib/libblockdev.so: ${LIBRARY_FILES} ${PLUGIN_SOURCE_FILES}
-	gcc -fPIC -c `pkg-config --libs --cflags glib-2.0` -ldl $< -o src/lib/blockdev.o
+	gcc -fPIC -c ${GLIB_INCLUDES} $< -o src/lib/blockdev.o
 	gcc -shared -o $@ src/lib/blockdev.o
 
 build-introspection-data: src/lib/libblockdev.so ${LIBRARY_FILES}
-	LD_LIBRARY_PATH=src/lib/ g-ir-scanner `pkg-config --cflags --libs glib-2.0 gobject-2.0 libcryptsetup` --library=blockdev -I src/lib/ -L src/lib/ --identifier-prefix=BD --symbol-prefix=bd --namespace BlockDev --nsversion=1.0 -o BlockDev-1.0.gir --warn-all src/lib/blockdev.h src/lib/blockdev.c src/lib/plugins.h src/lib/plugin_apis/lvm.h src/lib/plugin_apis/swap.h src/lib/plugin_apis/loop.h src/lib/plugin_apis/crypto.h
+	LD_LIBRARY_PATH=src/lib/ g-ir-scanner ${GLIB_INCLUDES} ${GOBJECT_INCLUDES} ${LIBCRYPTSETUP_INCLUDES} --library=blockdev -I src/lib/ -L src/lib/ --identifier-prefix=BD --symbol-prefix=bd --namespace BlockDev --nsversion=1.0 -o BlockDev-1.0.gir --warn-all src/lib/blockdev.h src/lib/blockdev.c src/lib/plugins.h src/lib/plugin_apis/lvm.h src/lib/plugin_apis/swap.h src/lib/plugin_apis/loop.h src/lib/plugin_apis/crypto.h
 	g-ir-compiler -o BlockDev-1.0.typelib BlockDev-1.0.gir
 
 test-sizes: ${SIZES_FILES}
-- 
1.9.3



More information about the anaconda-patches mailing list