diff options
author | Sam James <sam@gentoo.org> | 2022-04-03 03:26:20 +0100 |
---|---|---|
committer | Sam James <sam@gentoo.org> | 2022-04-06 01:20:39 +0100 |
commit | 01603e2b71eb93770137daf6ed93b54741ce14dc (patch) | |
tree | b6be56cb7fc5de4ad7213ba68df91d250cd73cd9 | |
parent | 9fbd6009cd917f1152a367fa7e5ae3993133c1e4 (diff) | |
download | open-iscsi-01603e2b71eb93770137daf6ed93b54741ce14dc.tar.gz |
Makefiles: respect $(CC) fully (don't hardcode GCC); use $(RM)
- Don't hardcode GCC, instead respect the detected CC (or from the environment)
- Use $(RM) as the location may vary and we've already done the work to detect it
Signed-off-by: Sam James <sam@gentoo.org>
-rw-r--r-- | libopeniscsiusr/Makefile | 2 | ||||
-rw-r--r-- | usr/Makefile | 2 | ||||
-rw-r--r-- | usr/fwparam_ibft/Makefile | 4 | ||||
-rw-r--r-- | utils/Makefile | 2 | ||||
-rw-r--r-- | utils/sysdeps/Makefile | 4 |
5 files changed, 7 insertions, 7 deletions
diff --git a/libopeniscsiusr/Makefile b/libopeniscsiusr/Makefile index f6b5b5b..62ef191 100644 --- a/libopeniscsiusr/Makefile +++ b/libopeniscsiusr/Makefile @@ -108,7 +108,7 @@ docs/man/$(EXTRA_MAN_FILES).gz: $(HEADERS) perl docs/doc-preclean.pl > "$(TEMPFILE)" perl docs/kernel-doc -man "$(TEMPFILE)" | \ perl docs/split-man.pl docs/man - -rm -f "$(TEMPFILE)" + -$(RM) "$(TEMPFILE)" @for file in docs/man/*.3; do \ gzip -f $$file; \ done diff --git a/usr/Makefile b/usr/Makefile index 41afa63..3d52d49 100644 --- a/usr/Makefile +++ b/usr/Makefile @@ -120,7 +120,7 @@ clean: $(MAKE) $(MFLAGS) -C $(FW_BOOT_DIR) clean depend: - gcc $(CFLAGS) -M `ls *.c` > .depend + $(CC) $(CFLAGS) -M `ls *.c` > .depend $(MAKE) $(MFLAGS) -C $(FW_BOOT_DIR) depend -include .depend diff --git a/usr/fwparam_ibft/Makefile b/usr/fwparam_ibft/Makefile index 6739f41..768b573 100644 --- a/usr/fwparam_ibft/Makefile +++ b/usr/fwparam_ibft/Makefile @@ -42,11 +42,11 @@ LDFLAGS += -L$(TOPDIR)/libopeniscsiusr -liscsiusr all: $(OBJS) clean: - rm -f $(CLEANFILES) .depend + $(RM) $(CLEANFILES) .depend $(OBJS): prom_parse.tab.h prom_parse.h depend: - gcc $(CFLAGS) -M `ls *.c` > .depend + $(CC) $(CFLAGS) -M `ls *.c` > .depend -include .depend diff --git a/utils/Makefile b/utils/Makefile index 01f7e0b..ecbd9c1 100644 --- a/utils/Makefile +++ b/utils/Makefile @@ -74,6 +74,6 @@ clean: $(RM) .depend depend: - gcc $(CFLAGS) -M `ls *.c` > .depend + $(CC) $(CFLAGS) -M `ls *.c` > .depend -include .depend diff --git a/utils/sysdeps/Makefile b/utils/sysdeps/Makefile index 4299164..3387b57 100644 --- a/utils/sysdeps/Makefile +++ b/utils/sysdeps/Makefile @@ -8,9 +8,9 @@ SYSDEPS_OBJS=sysdeps.o all: $(SYSDEPS_OBJS) clean: - rm -f *.o .depend + $(RM) *.o .depend depend: - gcc $(CFLAGS) -M `ls *.c` > .depend + $(CC) $(CFLAGS) -M `ls *.c` > .depend -include .depend |