[libblockdev 09/10] Make build-library into a file target.

mulhern amulhern at redhat.com
Wed Jun 25 21:35:38 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 8d5bef7..331d1dc 100644
--- a/Makefile
+++ b/Makefile
@@ -27,11 +27,11 @@ build-plugins: ${LVM_PLUGIN_FILES} ${SWAP_PLUGIN_FILES} ${LOOP_PLUGIN_FILES} ${S
 src/lib/plugin_apis/%.c: src/lib/plugin_apis/%.h
 	./boilerplate_generator.py $< > $@
 
-build-library: ${PLUGIN_SOURCE_FILES} ${LIBRARY_FILES}
-	gcc -fPIC -c `pkg-config --libs --cflags glib-2.0` -ldl src/lib/blockdev.c
-	gcc -shared -o src/lib/libblockdev.so blockdev.o
+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 -shared -o $@ src/lib/blockdev.o
 
-build-introspection-data: build-library ${LIBRARY_FILES}
+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
 	g-ir-compiler -o BlockDev-1.0.typelib BlockDev-1.0.gir
 
@@ -67,18 +67,20 @@ test-library: ${PLUGIN_SOURCE_FILES} build-plugins
 	LD_LIBRARY_PATH=src/plugins/ ./test_library
 	@rm test_library
 
-test-from-python: build-library build-plugins build-introspection-data
+test-from-python: src/lib/libblockdev.so build-plugins build-introspection-data
 	GI_TYPELIB_PATH=. LD_LIBRARY_PATH=src/plugins/:src/lib/ python -c 'from gi.repository import BlockDev; BlockDev.init(None); print BlockDev.lvm_get_max_lv_size()'
 
-run-ipython: build-library build-plugins build-introspection-data
+run-ipython: src/lib/libblockdev.so build-plugins build-introspection-data
 	GI_TYPELIB_PATH=. LD_LIBRARY_PATH=src/plugins/:src/lib/ ipython
 
-run-root-ipython: build-library build-plugins build-introspection-data
+run-root-ipython: src/lib/libblockdev.so build-plugins build-introspection-data
 	sudo GI_TYPELIB_PATH=. LD_LIBRARY_PATH=src/plugins/:src/lib/ ipython
 
-test: build-library build-plugins build-introspection-data
+test: src/lib/libblockdev.so build-plugins build-introspection-data
 	@echo
 	@sudo GI_TYPELIB_PATH=. LD_LIBRARY_PATH=src/plugins/:src/lib/ PYTHONPATH=.:tests/ python -m unittest discover -v -s tests/ -p '*_test.py'
 
 clean:
 	-rm src/lib/plugin_apis/*.c
+	-rm src/lib/blockdev.o
+	-rm src/lib/libblockdev.so
-- 
1.9.3



More information about the anaconda-patches mailing list