ubports-volte/libgbinder
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[build] Use MAKE var instead of explicitly calling make

Browse Source 
There are multiple make implementations and nothing guarantees that the
make executable is gmake, which is what this Makefile requires.
This commit is contained in:
Jami Kettunen
2023-09-05 18:20:10 +03:00
parent 62b9b30865
commit a89dcd2702
4 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Makefile
View File

@@ -50,10 +50,10 @@ RELEASE_DEPS = libglibutil_release
.PHONY: libglibutil_debug libglibutil_release .PHONY: libglibutil_debug libglibutil_release
libglibutil_debug: libglibutil_debug:
make -C $(LIBGLIBUTIL_PATH) debug $(MAKE) -C $(LIBGLIBUTIL_PATH) debug
libglibutil_release: libglibutil_release:
make -C $(LIBGLIBUTIL_PATH) release $(MAKE) -C $(LIBGLIBUTIL_PATH) release
endif endif
@@ -237,8 +237,8 @@ print_release_path:
@echo $(RELEASE_BUILD_DIR) @echo $(RELEASE_BUILD_DIR)
clean: clean:
make -C test clean $(MAKE) -C test clean
make -C unit clean $(MAKE) -C unit clean
rm -fr test/coverage/results test/coverage/*.gcov rm -fr test/coverage/results test/coverage/*.gcov
rm -f *~ $(SRC_DIR)/*~ $(INCLUDE_DIR)/*~ rm -f *~ $(SRC_DIR)/*~ $(INCLUDE_DIR)/*~
rm -fr $(BUILD_DIR) RPMS installroot rm -fr $(BUILD_DIR) RPMS installroot
@@ -248,7 +248,7 @@ clean:
rm -f debian/libgbinder.install debian/libgbinder-dev.install rm -f debian/libgbinder.install debian/libgbinder-dev.install
test: test:
make -C unit test $(MAKE) -C unit test
$(BUILD_DIR): $(BUILD_DIR):
mkdir -p $@ mkdir -p $@

4
test/binder-call/Makefile
View File

@@ -54,7 +54,7 @@ INCLUDES = -I$(LIB_DIR)/include -I$(GEN_DIR) -I$(SRC_DIR)
CFLAGS += -fPIC $(DEFINES) $(WARNINGS) $(INCLUDES) -MMD -MP \ CFLAGS += -fPIC $(DEFINES) $(WARNINGS) $(INCLUDES) -MMD -MP \
$(shell pkg-config --cflags $(PKGS)) $(shell pkg-config --cflags $(PKGS))
LDFLAGS += -pie $(shell pkg-config --libs $(PKGS)) LDFLAGS += -pie $(shell pkg-config --libs $(PKGS))
QUIET_MAKE = make --no-print-directory QUIET_MAKE = $(MAKE) --no-print-directory
DEBUG_FLAGS = -g DEBUG_FLAGS = -g
RELEASE_FLAGS = RELEASE_FLAGS =
@@ -120,7 +120,7 @@ clean:
rm -fr $(BUILD_DIR) rm -fr $(BUILD_DIR)
cleaner: clean cleaner: clean
@make -C $(LIB_DIR) clean @$(MAKE) -C $(LIB_DIR) clean
$(DEBUG_BUILD_DIR): $(DEBUG_BUILD_DIR):
mkdir -p $@ mkdir -p $@

4
test/common/Makefile
View File

@@ -52,7 +52,7 @@ INCLUDES = -I$(LIB_DIR)/include
CFLAGS += -fPIC $(DEFINES) $(WARNINGS) $(INCLUDES) -MMD -MP \ CFLAGS += -fPIC $(DEFINES) $(WARNINGS) $(INCLUDES) -MMD -MP \
$(shell pkg-config --cflags $(PKGS)) $(shell pkg-config --cflags $(PKGS))
LDFLAGS += -pie $(shell pkg-config --libs $(PKGS)) LDFLAGS += -pie $(shell pkg-config --libs $(PKGS))
QUIET_MAKE = make --no-print-directory QUIET_MAKE = $(MAKE) --no-print-directory
DEBUG_FLAGS = -g DEBUG_FLAGS = -g
RELEASE_FLAGS = RELEASE_FLAGS =
@@ -110,7 +110,7 @@ clean:
rm -fr $(BUILD_DIR) rm -fr $(BUILD_DIR)
cleaner: clean cleaner: clean
@make -C $(LIB_DIR) clean @$(MAKE) -C $(LIB_DIR) clean
$(DEBUG_BUILD_DIR): $(DEBUG_BUILD_DIR):
mkdir -p $@ mkdir -p $@

8
unit/common/Makefile
View File

@@ -37,10 +37,10 @@ RELEASE_DEPS = libglibutil_release
.PHONY: libglibutil_debug libglibutil_release .PHONY: libglibutil_debug libglibutil_release
libglibutil_debug: libglibutil_debug:
make -C $(LIBGLIBUTIL_PATH) debug $(MAKE) -C $(LIBGLIBUTIL_PATH) debug
libglibutil_release: libglibutil_release:
make -C $(LIBGLIBUTIL_PATH) release $(MAKE) -C $(LIBGLIBUTIL_PATH) release
endif endif
@@ -79,7 +79,7 @@ FULL_CFLAGS = $(BASE_CFLAGS) $(DEFINES) $(WARNINGS) $(INCLUDES) -MMD -MP \
$(shell pkg-config --cflags $(PKGS)) $(shell pkg-config --cflags $(PKGS))
FULL_LDFLAGS = $(BASE_LDFLAGS) FULL_LDFLAGS = $(BASE_LDFLAGS)
LIBS = $(shell pkg-config --libs $(PKGS)) -lpthread LIBS = $(shell pkg-config --libs $(PKGS)) -lpthread
QUIET_MAKE = make --no-print-directory QUIET_MAKE = $(MAKE) --no-print-directory
DEBUG_FLAGS = -g DEBUG_FLAGS = -g
RELEASE_FLAGS = RELEASE_FLAGS =
COVERAGE_FLAGS = -g COVERAGE_FLAGS = -g
@@ -158,7 +158,7 @@ unitclean:
clean: unitclean clean: unitclean
cleaner: unitclean cleaner: unitclean
@make -C $(LIB_DIR) clean @$(MAKE) -C $(LIB_DIR) clean
test_banner: test_banner:
@echo "===========" $(EXE) "=========== " @echo "===========" $(EXE) "=========== "