diff options
author | Lee Duncan <lduncan@suse.com> | 2022-03-31 11:13:51 -0700 |
---|---|---|
committer | Lee Duncan <lduncan@suse.com> | 2022-03-31 11:13:51 -0700 |
commit | 61443d7db7de606c28cddfc5b9002135b8cadc9d (patch) | |
tree | 0a2f720698499d8515867951373e14850914aa3e | |
parent | 4cc94655720a5c1fe3baf1cb903ed35880d505fe (diff) | |
download | open-iscsi-61443d7db7de606c28cddfc5b9002135b8cadc9d.tar.gz |
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.
-rw-r--r-- | Makefile | 2 | ||||
-rw-r--r-- | usr/.gitignore | 1 | ||||
-rw-r--r-- | usr/Makefile | 33 | ||||
-rw-r--r-- | usr/fwparam_ibft/Makefile (renamed from utils/fwparam_ibft/Makefile) | 0 | ||||
-rw-r--r-- | usr/fwparam_ibft/fw_entry.c (renamed from utils/fwparam_ibft/fw_entry.c) | 0 | ||||
-rw-r--r-- | usr/fwparam_ibft/fwparam.h (renamed from utils/fwparam_ibft/fwparam.h) | 0 | ||||
-rw-r--r-- | usr/fwparam_ibft/fwparam_ibft.c (renamed from utils/fwparam_ibft/fwparam_ibft.c) | 0 | ||||
-rw-r--r-- | usr/fwparam_ibft/fwparam_ibft.h (renamed from utils/fwparam_ibft/fwparam_ibft.h) | 0 | ||||
-rw-r--r-- | usr/fwparam_ibft/fwparam_ppc.c (renamed from utils/fwparam_ibft/fwparam_ppc.c) | 0 | ||||
-rw-r--r-- | usr/fwparam_ibft/fwparam_sysfs.c (renamed from utils/fwparam_ibft/fwparam_sysfs.c) | 0 | ||||
-rw-r--r-- | usr/fwparam_ibft/iscsi_obp.h (renamed from utils/fwparam_ibft/iscsi_obp.h) | 0 | ||||
-rw-r--r-- | usr/fwparam_ibft/prom_lex.c (renamed from utils/fwparam_ibft/prom_lex.c) | 0 | ||||
-rw-r--r-- | usr/fwparam_ibft/prom_lex.l (renamed from utils/fwparam_ibft/prom_lex.l) | 0 | ||||
-rw-r--r-- | usr/fwparam_ibft/prom_parse.h (renamed from utils/fwparam_ibft/prom_parse.h) | 0 | ||||
-rw-r--r-- | usr/fwparam_ibft/prom_parse.tab.c (renamed from utils/fwparam_ibft/prom_parse.tab.c) | 0 | ||||
-rw-r--r-- | usr/fwparam_ibft/prom_parse.tab.h (renamed from utils/fwparam_ibft/prom_parse.tab.h) | 0 | ||||
-rw-r--r-- | usr/fwparam_ibft/prom_parse.y (renamed from utils/fwparam_ibft/prom_parse.y) | 0 | ||||
-rw-r--r-- | utils/Makefile | 4 |
18 files changed, 26 insertions, 14 deletions
@@ -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 diff --git a/usr/.gitignore b/usr/.gitignore index 32000e2..a672448 100644 --- a/usr/.gitignore +++ b/usr/.gitignore @@ -1,3 +1,4 @@ iscsiadm iscsid iscsistart +.depend diff --git a/usr/Makefile b/usr/Makefile index 04e0bbb..0ec9922 100644 --- a/usr/Makefile +++ b/usr/Makefile @@ -62,32 +62,36 @@ PROGRAMS = iscsid iscsiadm iscsistart PROGRAMS_DEST = $(addprefix $(DESTDIR)$(SBINDIR)/,$(PROGRAMS)) # libc compat files -SYSDEPS_SRCS = $(sort $(wildcard ../utils/sysdeps/*.o)) +SYSDEPS_DIR = $(TOPDIR)/utils/sysdeps +SYSDEPS_OBJS = $(SYSDEPS_DIR)/sysdeps.o # sources shared between iscsid, iscsiadm and iscsistart -ISCSI_LIB_SRCS = iscsi_util.o io.o auth.o iscsi_timer.o login.o log.o \ +ISCSI_LIB_OBJS = iscsi_util.o io.o auth.o iscsi_timer.o login.o log.o \ iface.o idbm.o sysfs.o host.o session_info.o iscsi_sysfs.o \ iscsi_net_util.o iscsid_req.o transport.o iser.o cxgbi.o be2iscsi.o \ initiator_common.o iscsi_err.o flashnode.o uip_mgmt_ipc.o \ - netlink.o $(SYSDEPS_SRCS) + netlink.o # core initiator files -INITIATOR_SRCS = initiator.o scsi.o actor.o event_poll.o mgmt_ipc.o kern_err_table.o +INITIATOR_OBJS = initiator.o scsi.o actor.o event_poll.o mgmt_ipc.o kern_err_table.o # fw boot files -FW_BOOT_SRCS = $(sort $(wildcard ../utils/fwparam_ibft/*.o)) +FW_BOOT_DIR = fwparam_ibft +FW_BOOT_OBJ_FILES = fw_entry.o fwparam_sysfs.o prom_lex.o prom_parse.tab.o fwparam_ppc.o +FW_BOOT_OBJS = $(addprefix $(FW_BOOT_DIR)/,$(FW_BOOT_OBJ_FILES)) # core discovery files -DISCOVERY_SRCS = $(FW_BOOT_SRCS) local_strings.o discovery.o +DISCOVERY_OBJS = local_strings.o discovery.o all: $(PROGRAMS) -iscsid: $(ISCSI_LIB_SRCS) $(INITIATOR_SRCS) $(DISCOVERY_SRCS) \ +iscsid: $(ISCSI_LIB_OBJS) $(SYSDEPS_OBJS) $(INITIATOR_OBJS) $(DISCOVERY_OBJS) $(FW_BOOT_OBJS) \ iscsid.o session_mgmt.o discoveryd.o mntcheck.o $(CC) $(CFLAGS) $^ -o $@ -lisns -lcrypto -lrt -lmount $(LDFLAGS) $(ISCSI_LIB) -iscsiadm: $(ISCSI_LIB_SRCS) $(DISCOVERY_SRCS) iscsiadm.o session_mgmt.o mntcheck.o +iscsiadm: $(ISCSI_LIB_OBJS) $(SYSDEPS_OBJS) $(DISCOVERY_OBJS) $(FW_BOOT_OBJS) \ + iscsiadm.o session_mgmt.o mntcheck.o $(CC) $(CFLAGS) $^ -o $@ -lisns -lcrypto -lmount $(LDFLAGS) $(ISCSI_LIB) -iscsistart: $(ISCSI_LIB_SRCS) $(INITIATOR_SRCS) $(FW_BOOT_SRCS) \ +iscsistart: $(ISCSI_LIB_OBJS) $(SYSDEPS_OBJS) $(INITIATOR_OBJS) $(FW_BOOT_OBJS) \ iscsistart.o statics.o $(CC) $(CFLAGS) $^ -o $@ -lcrypto -lrt $(LDFLAGS) $(ISCSI_LIB) @@ -99,10 +103,19 @@ $(DESTDIR)$(SBINDIR): $(PROGRAMS_DEST): $(DESTDIR)$(SBINDIR)/%: % $(INSTALL) -m 755 $? $@ +$(SYSDEPS_OBJS): + $(MAKE) $(MFLAGS) -C $(SYSDEPS_DIR) + +$(FW_BOOT_OBJS): + $(MAKE) $(MFLAGS) -C $(FW_BOOT_DIR) + clean: - rm -f *.o $(PROGRAMS) .depend $(LIBSYS) + $(RM) $(ISCSI_LIB_OBJS) $(INITIATOR_OBJS) $(DISCOVERY_OBJS) \ + $(PROGRAMS) .depend + $(MAKE) $(MFLAGS) -C $(FW_BOOT_DIR) clean depend: gcc $(CFLAGS) -M `ls *.c` > .depend + $(MAKE) $(MFLAGS) -C $(FW_BOOT_DIR) depend -include .depend diff --git a/utils/fwparam_ibft/Makefile b/usr/fwparam_ibft/Makefile index c27ba40..c27ba40 100644 --- a/utils/fwparam_ibft/Makefile +++ b/usr/fwparam_ibft/Makefile diff --git a/utils/fwparam_ibft/fw_entry.c b/usr/fwparam_ibft/fw_entry.c index 96af145..96af145 100644 --- a/utils/fwparam_ibft/fw_entry.c +++ b/usr/fwparam_ibft/fw_entry.c diff --git a/utils/fwparam_ibft/fwparam.h b/usr/fwparam_ibft/fwparam.h index 141def7..141def7 100644 --- a/utils/fwparam_ibft/fwparam.h +++ b/usr/fwparam_ibft/fwparam.h diff --git a/utils/fwparam_ibft/fwparam_ibft.c b/usr/fwparam_ibft/fwparam_ibft.c index e68e503..e68e503 100644 --- a/utils/fwparam_ibft/fwparam_ibft.c +++ b/usr/fwparam_ibft/fwparam_ibft.c diff --git a/utils/fwparam_ibft/fwparam_ibft.h b/usr/fwparam_ibft/fwparam_ibft.h index 92968b3..92968b3 100644 --- a/utils/fwparam_ibft/fwparam_ibft.h +++ b/usr/fwparam_ibft/fwparam_ibft.h diff --git a/utils/fwparam_ibft/fwparam_ppc.c b/usr/fwparam_ibft/fwparam_ppc.c index da9d76e..da9d76e 100644 --- a/utils/fwparam_ibft/fwparam_ppc.c +++ b/usr/fwparam_ibft/fwparam_ppc.c diff --git a/utils/fwparam_ibft/fwparam_sysfs.c b/usr/fwparam_ibft/fwparam_sysfs.c index 87fd6d4..87fd6d4 100644 --- a/utils/fwparam_ibft/fwparam_sysfs.c +++ b/usr/fwparam_ibft/fwparam_sysfs.c diff --git a/utils/fwparam_ibft/iscsi_obp.h b/usr/fwparam_ibft/iscsi_obp.h index 8580052..8580052 100644 --- a/utils/fwparam_ibft/iscsi_obp.h +++ b/usr/fwparam_ibft/iscsi_obp.h diff --git a/utils/fwparam_ibft/prom_lex.c b/usr/fwparam_ibft/prom_lex.c index c8ed9cb..c8ed9cb 100644 --- a/utils/fwparam_ibft/prom_lex.c +++ b/usr/fwparam_ibft/prom_lex.c diff --git a/utils/fwparam_ibft/prom_lex.l b/usr/fwparam_ibft/prom_lex.l index e70c790..e70c790 100644 --- a/utils/fwparam_ibft/prom_lex.l +++ b/usr/fwparam_ibft/prom_lex.l diff --git a/utils/fwparam_ibft/prom_parse.h b/usr/fwparam_ibft/prom_parse.h index 00cffff..00cffff 100644 --- a/utils/fwparam_ibft/prom_parse.h +++ b/usr/fwparam_ibft/prom_parse.h diff --git a/utils/fwparam_ibft/prom_parse.tab.c b/usr/fwparam_ibft/prom_parse.tab.c index 6275961..6275961 100644 --- a/utils/fwparam_ibft/prom_parse.tab.c +++ b/usr/fwparam_ibft/prom_parse.tab.c diff --git a/utils/fwparam_ibft/prom_parse.tab.h b/usr/fwparam_ibft/prom_parse.tab.h index 4897b23..4897b23 100644 --- a/utils/fwparam_ibft/prom_parse.tab.h +++ b/usr/fwparam_ibft/prom_parse.tab.h diff --git a/utils/fwparam_ibft/prom_parse.y b/usr/fwparam_ibft/prom_parse.y index efe1578..efe1578 100644 --- a/utils/fwparam_ibft/prom_parse.y +++ b/usr/fwparam_ibft/prom_parse.y diff --git a/utils/Makefile b/utils/Makefile index 250b77e..01f7e0b 100644 --- a/utils/Makefile +++ b/utils/Makefile @@ -2,8 +2,8 @@ # # Make file for the util sub-directory # -# This make file does not control the fwparam_ibft -# or sysdeps subdirectories. Those are still controlled +# This make file does not control the sysdeps +# subdirectory, which is controlled # from the top-level make file. # |