From f6bd2c366b32262c2a5a1ac38713dc84bf7c9cbf Mon Sep 17 00:00:00 2001 From: Artem Bityutskiy Date: Fri, 16 Jan 2009 20:53:42 +0200 Subject: ubi-tests: fix build and some warnings Signed-off-by: Artem Bityutskiy --- tests/ubi-tests/Makefile | 40 ++++++++++------------------------------ 1 file changed, 10 insertions(+), 30 deletions(-) (limited to 'tests/ubi-tests/Makefile') diff --git a/tests/ubi-tests/Makefile b/tests/ubi-tests/Makefile index d122c8b..0ce99d8 100644 --- a/tests/ubi-tests/Makefile +++ b/tests/ubi-tests/Makefile @@ -1,45 +1,25 @@ LIBUBI_PATH=../../ubi-utils/new-utils/ LIBUBI_SRC_PATH=../../ubi-utils/new-utils/src/ LIBUBI_HEADER_PATH=../../ubi-utils/new-utils/include -UBI_HEADERS_PATH=../../include/ UBIUTILS_PATH=../../ubi-utils/new-utils/ -CC := $(CROSS)gcc +LIBUBI_PATH=../../ubi-utils/new-utils/ +KERNELHDR := ../../include -TESTS=io_update volrefcnt integ io_paral io_read io_basic \ +LIBS = libubi +TARGETS=io_update volrefcnt integ io_paral io_read io_basic \ mkvol_basic mkvol_bad mkvol_paral rsvol -# Because of implicite rules we use make treats .o files as intermediate, thus -# it removes the. If you want to prevent the removal, uncomment the below -#.SECONDARY: $(addsuffix .o, $(TESTS)) $(addsuffix .o, $(HELPERS)) - -CFLAGS += -Wall -I$(LIBUBI_HEADER_PATH) -I $(UBI_HEADERS_PATH) -L. -O2 +CFLAGS += -I$(LIBUBI_HEADER_PATH) -I $(KERNELHDR) -lpthread -all: ubi-utils libubi $(TESTS) +include ../../common.mk # Compile ubilib with the udevsettle hack -libubi: $(LIBUBI_SRC_PATH)/libubi.c $(LIBUBI_HEADER_PATH)/libubi.h $(LIBUBI_SRC_PATH)/libubi_int.h +libubi.a: $(LIBUBI_SRC_PATH)/libubi.c $(LIBUBI_HEADER_PATH)/libubi.h $(LIBUBI_SRC_PATH)/libubi_int.h $(CC) $(CFLAGS) -I $(LIBUBI_SRC_PATH) -I../../include -DUDEV_SETTLE_HACK -c $(LIBUBI_SRC_PATH)/libubi.c -o libubi.o ar cr libubi.a libubi.o -# The below cancels existing implicite rule to make programs from .c files, -# in order to force make using our rule defined below -%: %.c - -# The below is the rule to get an .o file from a .c file -%.o: %.c - $(CC) $(CFLAGS) $< -c -o $@ - -# And the below is the rule to get final test executable from its .o and common.o -%: %.o common.o - $(CC) $(CFLAGS) $^ -lubi -o $@ - -# *paral tests require libpthread, thus the below rule for them -%paral: %paral.o common.o - $(CC) $(CFLAGS) $^ -lubi -lpthread -o $@ - -ubi-utils: - make -C $(UBIUTILS_PATH) +$(TARGETS): $(addprefix $(BUILDDIR)/, common.o) libubi.a -clean: - rm -f $(TESTS) $(addsuffix .o, $(TESTS)) libubi.* $(HELPERS) $(addsuffix .o, $(HELPERS)) +clean:: + rm -f $(TARGETS) $(addsuffix .o, $(TESTS)) libubi.* -- cgit v1.2.3