diff options
| author | Lee Duncan <lduncan@suse.com> | 2022-03-31 11:27:37 -0700 |
|---|---|---|
| committer | Lee Duncan <lduncan@suse.com> | 2022-03-31 11:36:09 -0700 |
| commit | 0d885f85b96a34dbff5225b8d96e395407bca38f (patch) | |
| tree | e9b5b6654fa2cdf8654c63fa5616c85f8138016e /usr | |
| parent | 183dfc4d342f869867a04690f8cde6370ae9c0be (diff) | |
| download | open-iscsi-0d885f85b96a34dbff5225b8d96e395407bca38f.tar.gz | |
Build: cleanup usr Makefile: remove obj files on "clean"
Commit 61443d7db7de ("Build: Cleanup fwparam_ibft and sysdeps subdirs."
changed the "clean" target in usr/Makefile so that it no longer
removed all object files, rather just removing the ones it knows
about. But that commit missed some object files.
Diffstat (limited to 'usr')
| -rw-r--r-- | usr/Makefile | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/usr/Makefile b/usr/Makefile index 0ec9922..41afa63 100644 --- a/usr/Makefile +++ b/usr/Makefile @@ -61,6 +61,10 @@ CFLAGS += -DISCSI_CONFIG_ROOT=\"$(HOMEDIR)\" PROGRAMS = iscsid iscsiadm iscsistart PROGRAMS_DEST = $(addprefix $(DESTDIR)$(SBINDIR)/,$(PROGRAMS)) +ISCSID_OBJS = iscsid.o session_mgmt.o discoveryd.o mntcheck.o +ISCSIADM_OBJS = iscsiadm.o session_mgmt.o mntcheck.o +ISCSISTART_OBJS = iscsistart.o statics.o + # libc compat files SYSDEPS_DIR = $(TOPDIR)/utils/sysdeps SYSDEPS_OBJS = $(SYSDEPS_DIR)/sysdeps.o @@ -84,15 +88,15 @@ DISCOVERY_OBJS = local_strings.o discovery.o all: $(PROGRAMS) iscsid: $(ISCSI_LIB_OBJS) $(SYSDEPS_OBJS) $(INITIATOR_OBJS) $(DISCOVERY_OBJS) $(FW_BOOT_OBJS) \ - iscsid.o session_mgmt.o discoveryd.o mntcheck.o + $(ISCSID_OBJS) $(CC) $(CFLAGS) $^ -o $@ -lisns -lcrypto -lrt -lmount $(LDFLAGS) $(ISCSI_LIB) iscsiadm: $(ISCSI_LIB_OBJS) $(SYSDEPS_OBJS) $(DISCOVERY_OBJS) $(FW_BOOT_OBJS) \ - iscsiadm.o session_mgmt.o mntcheck.o + $(ISCSIADM_OBJS) $(CC) $(CFLAGS) $^ -o $@ -lisns -lcrypto -lmount $(LDFLAGS) $(ISCSI_LIB) iscsistart: $(ISCSI_LIB_OBJS) $(SYSDEPS_OBJS) $(INITIATOR_OBJS) $(FW_BOOT_OBJS) \ - iscsistart.o statics.o + $(ISCSISTART_OBJS) $(CC) $(CFLAGS) $^ -o $@ -lcrypto -lrt $(LDFLAGS) $(ISCSI_LIB) install: $(DESTDIR)$(SBINDIR) $(PROGRAMS_DEST) @@ -111,6 +115,7 @@ $(FW_BOOT_OBJS): clean: $(RM) $(ISCSI_LIB_OBJS) $(INITIATOR_OBJS) $(DISCOVERY_OBJS) \ + $(ISCSISTART_OBJS) $(ISCSID_OBJS) $(ISCSIADM_OBJS) \ $(PROGRAMS) .depend $(MAKE) $(MFLAGS) -C $(FW_BOOT_DIR) clean |