Commit 7b759f09 authored by Hamish Moffatt's avatar Hamish Moffatt
Browse files

Make the autotools xyz-clean target call xyz-uninstall first, rather than duplicating its actions

parent ea8e74bc

package/Makefile.autotools.in

+2 −5
Original line number Diff line number Diff line
@@ -247,10 +247,6 @@ $(BUILD_DIR)/%/.stamp_target_installed: 


$(BUILD_DIR)/%/.stamp_cleaned:

	$(call MESSAGE,"Cleaning up")

	-$($(PKG)_MAKE_ENV) $(MAKE)  $($(PKG)_UNINSTALL_STAGING_OPT) -C $(@D)/$($(PKG)_SUBDIR)

	rm -f $(@D)/.stamp_staging_installed

	-$($(PKG)_MAKE_ENV) $(MAKE)  $($(PKG)_UNINSTALL_TARGET_OPT) -C $(@D)/$($(PKG)_SUBDIR)

	rm -f $(@D)/.stamp_target_installed

	-$($(PKG)_MAKE_ENV) $(MAKE)  $($(PKG)_CLEAN_OPT) -C $(@D)/$($(PKG)_SUBDIR)

	rm -f $(@D)/.stamp_built
@@ -368,7 +364,8 @@ $(1)-source: $$($(2)_TARGET_SOURCE) 
# non-build targets

$(1)-uninstall:	$(1)-configure $$($(2)_TARGET_UNINSTALL)



$(1)-clean:		$$($(2)_TARGET_CLEAN)

$(1)-clean:		$(1)-uninstall \

			$$($(2)_TARGET_CLEAN)



$(1)-dirclean:		$$($(2)_TARGET_DIRCLEAN)