diff options
| author | Alexander Amelkin <alexander@amelkin.msk.ru> | 2020-06-30 16:19:35 +0300 |
|---|---|---|
| committer | Alexander Amelkin <alexander@amelkin.msk.ru> | 2020-06-30 16:19:35 +0300 |
| commit | 1f92c9ee233fda6b7b20bcbd727adf89e53d2326 (patch) | |
| tree | 1305f50493d74bc1deecb555f9aab4216058cec7 | |
| parent | b18619e14e69dcf8e9f06c8ccb666f6f82db1807 (diff) | |
| download | ipmitool-1f92c9ee233fda6b7b20bcbd727adf89e53d2326.tar.gz | |
dist: Fix dependencies and cleanup
The `make distcheck` was failing because of some files deleted twice
and some intermediate files not deleted at all.
Signed-off-by: Alexander Amelkin <alexander@amelkin.msk.ru>
| -rw-r--r-- | Makefile.am | 12 | ||||
| -rw-r--r-- | lib/Makefile.am | 3 |
2 files changed, 11 insertions, 4 deletions
diff --git a/Makefile.am b/Makefile.am index 9f71372..00335d0 100644 --- a/Makefile.am +++ b/Makefile.am @@ -46,7 +46,8 @@ IANA_PEN = http://www.iana.org/assignments/enterprise-numbers dist-hook: cp control/ipmitool.spec $(distdir) -.PHONY: install-pen-database +.PHONY: install-pen-database uninstall-pen-database +.INTERMEDIATE: %.o %.la enterprise-numbers if DOWNLOAD @@ -63,19 +64,26 @@ install-pen-database: enterprise-numbers mkdir -m 755 -p $(DESTDIR)$(IANADIR) $(INSTALL_DATA) $< -t $(DESTDIR)$(IANADIR)/ +uninstall-pen-database: + -rm -rf $(DESTDIR)$(IANADIR)/enterprise-numbers + else install-pen-database: @echo "*** NOT installing the IANA PEN database." @echo "*** Don't know how to download it." +uninstall-pen-database: + @echo "*** NOT uninstalling the IANA PEN database." + @echo "*** It was installed manually (if ever)." + endif install-data-local: install-pen-database mkdir -p $(DESTDIR)$(DOCDIR) $(INSTALL_DATA) $(DOCLIST) $(DESTDIR)$(DOCDIR) -uninstall-local: +uninstall-local: uninstall-pen-database -rm -rf $(DESTDIR)$(DOCDIR) .PHONY: pkg diff --git a/lib/Makefile.am b/lib/Makefile.am index 258aa1c..49f5a8a 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -41,8 +41,7 @@ libipmitool_la_SOURCES = helper.c ipmi_sdr.c ipmi_sel.c ipmi_sol.c ipmi_pef.c \ ipmi_main.c ipmi_tsol.c ipmi_firewall.c ipmi_kontronoem.c \ ipmi_hpmfwupg.c ipmi_sdradd.c ipmi_ekanalyzer.c ipmi_gendev.c \ ipmi_ime.c ipmi_delloem.c ipmi_dcmi.c hpm2.c ipmi_vita.c \ - ipmi_lanp6.c ipmi_cfgp.c ipmi_quantaoem.c ipmi_time.c \ - ../src/plugins/lan/md5.c ../src/plugins/lan/md5.h + ipmi_lanp6.c ipmi_cfgp.c ipmi_quantaoem.c ipmi_time.c libipmitool_la_LDFLAGS = -export-dynamic libipmitool_la_LIBADD = -lm |