From 61443d7db7de606c28cddfc5b9002135b8cadc9d Mon Sep 17 00:00:00 2001 From: Lee Duncan Date: Thu, 31 Mar 2022 11:13:51 -0700 Subject: Build: Cleanup fwparam_ibft and sysdeps subdirs. This commit moves the "fwparam_ibft" subdirectory from being under "utils" to being under "usr", where its actually used. It also updates usr/Makefile so that it's smarter about how and when to build the fwparam_ibft object files it needs, as well as how to build sysdeps.o. From the top-level Makefile, "make user" will now make the fwparam_ibft files, as needed for the "user" targets, before building iscsid and friends. --- Makefile | 2 -- 1 file changed, 2 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 12b7f9d..caeccf5 100644 --- a/Makefile +++ b/Makefile @@ -51,7 +51,6 @@ make_utils: user: iscsiuio/Makefile $(MAKE) $(MFLAGS) -C libopeniscsiusr $(MAKE) $(MFLAGS) -C utils/sysdeps - $(MAKE) $(MFLAGS) -C utils/fwparam_ibft $(MAKE) $(MFLAGS) -C usr $(MAKE) $(MFLAGS) -C utils $(MAKE) $(MFLAGS) -C etc @@ -78,7 +77,6 @@ force: ; clean: $(MAKE) $(MFLAGS) -C utils/sysdeps clean - $(MAKE) $(MFLAGS) -C utils/fwparam_ibft clean $(MAKE) $(MFLAGS) -C utils clean $(MAKE) $(MFLAGS) -C usr clean $(MAKE) $(MFLAGS) -C etc clean -- cgit v1.2.1