From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1521) id 8B6F53858C78; Sat, 5 Nov 2022 12:59:39 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 8B6F53858C78 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1667653179; bh=MdXgL57ucoYFWnrLuwdcDyCswPtYZe+72TJseyDTVt4=; h=From:To:Subject:Date:From; b=GCDEwBmP/JbqC7sDeL+eiI7MksV+addj8v5H3YMjtKTGlKkmWOvL6GtsDo3rH+MfB XR9th0qSVZdq5evMv/KPAtrZeGgJyEDx0SwUx2QUkQXR0TIOusH1LqMsKN1FMybkVE 5uSYlZAj+LgAE9kXPnk15QVbGqNFNw5NLIPl5KFU= Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable From: Michael Frysinger To: gdb-cvs@sourceware.org Subject: [binutils-gdb] sim: build: add uninstall support X-Act-Checkin: binutils-gdb X-Git-Author: Mike Frysinger X-Git-Refname: refs/heads/master X-Git-Oldrev: 63bf33ff90b1bf1e2278259648173bfebaac2e9c X-Git-Newrev: 59d8576e4ff7e6467fab3ea894baa72c8400e22a Message-Id: <20221105125939.8B6F53858C78@sourceware.org> Date: Sat, 5 Nov 2022 12:59:39 +0000 (GMT) List-Id: https://sourceware.org/git/gitweb.cgi?p=3Dbinutils-gdb.git;h=3D59d8576e4ff7= e6467fab3ea894baa72c8400e22a commit 59d8576e4ff7e6467fab3ea894baa72c8400e22a Author: Mike Frysinger Date: Sat Nov 5 14:44:15 2022 +0700 sim: build: add uninstall support =20 This never worked before, but adding it to the common top-level dir is pretty easy to do now that we're unified. Diff: --- sim/Makefile.am | 8 ++++++ sim/Makefile.in | 66 +++++++++++++++++++++++++++----------------= ---- sim/common/Make-common.in | 1 + sim/erc32/local.mk | 4 +++ sim/ppc/Makefile.in | 1 + 5 files changed, 52 insertions(+), 28 deletions(-) diff --git a/sim/Makefile.am b/sim/Makefile.am index 523d8f8dec9..4e4068a3539 100644 --- a/sim/Makefile.am +++ b/sim/Makefile.am @@ -63,6 +63,8 @@ SIM_ALL_RECURSIVE_DEPS =3D SIM_INSTALL_DATA_LOCAL_DEPS =3D ## Deps to add to the install-exec-local target. SIM_INSTALL_EXEC_LOCAL_DEPS =3D +## Deps to add to the uninstall-local target. +SIM_UNINSTALL_LOCAL_DEPS =3D =20 # Generate target constants for newlib/libgloss from its source tree. # This file is shipped with distributions so we build in the source dir. @@ -165,3 +167,9 @@ install-exec-local: installdirs $(SIM_INSTALL_EXEC_LOCA= L_DEPS) $(INSTALL_PROGRAM) $$d/run$(EXEEXT) $(DESTDIR)$(bindir)/$$n$(EXEEXT) ||= exit 1; \ fi; \ done + +uninstall-local: $(SIM_UNINSTALL_LOCAL_DEPS) + rm -f $(DESTDIR)$(bindir)/run $(DESTDIR)$(libdir)/libsim.a + for d in $(SUBDIRS); do \ + rm -f $(DESTDIR)$(bindir)/run-$$d $(DESTDIR)$(libdir)/libsim-$$d.a; \ + done diff --git a/sim/Makefile.in b/sim/Makefile.in index 7591aaa40b4..e9ba210c2bb 100644 --- a/sim/Makefile.in +++ b/sim/Makefile.in @@ -136,34 +136,35 @@ TESTS =3D testsuite/common/bits32m0$(EXEEXT) \ @SIM_ENABLE_ARCH_d10v_TRUE@am__append_15 =3D d10v/gencode @SIM_ENABLE_ARCH_d10v_TRUE@am__append_16 =3D $(d10v_BUILD_OUTPUTS) @SIM_ENABLE_ARCH_erc32_TRUE@am__append_17 =3D sim-%D-install-exec-local -@SIM_ENABLE_ARCH_frv_TRUE@am__append_18 =3D $(frv_BUILD_OUTPUTS) +@SIM_ENABLE_ARCH_erc32_TRUE@am__append_18 =3D sim-erc32-uninstall-local @SIM_ENABLE_ARCH_frv_TRUE@am__append_19 =3D $(frv_BUILD_OUTPUTS) -@SIM_ENABLE_ARCH_iq2000_TRUE@am__append_20 =3D $(iq2000_BUILD_OUTPUTS) +@SIM_ENABLE_ARCH_frv_TRUE@am__append_20 =3D $(frv_BUILD_OUTPUTS) @SIM_ENABLE_ARCH_iq2000_TRUE@am__append_21 =3D $(iq2000_BUILD_OUTPUTS) -@SIM_ENABLE_ARCH_lm32_TRUE@am__append_22 =3D $(lm32_BUILD_OUTPUTS) +@SIM_ENABLE_ARCH_iq2000_TRUE@am__append_22 =3D $(iq2000_BUILD_OUTPUTS) @SIM_ENABLE_ARCH_lm32_TRUE@am__append_23 =3D $(lm32_BUILD_OUTPUTS) -@SIM_ENABLE_ARCH_m32c_TRUE@am__append_24 =3D $(m32c_BUILD_OUTPUTS) -@SIM_ENABLE_ARCH_m32c_TRUE@am__append_25 =3D m32c/opc2c -@SIM_ENABLE_ARCH_m32c_TRUE@am__append_26 =3D \ +@SIM_ENABLE_ARCH_lm32_TRUE@am__append_24 =3D $(lm32_BUILD_OUTPUTS) +@SIM_ENABLE_ARCH_m32c_TRUE@am__append_25 =3D $(m32c_BUILD_OUTPUTS) +@SIM_ENABLE_ARCH_m32c_TRUE@am__append_26 =3D m32c/opc2c +@SIM_ENABLE_ARCH_m32c_TRUE@am__append_27 =3D \ @SIM_ENABLE_ARCH_m32c_TRUE@ $(m32c_BUILD_OUTPUTS) \ @SIM_ENABLE_ARCH_m32c_TRUE@ m32c/m32c.c.log \ @SIM_ENABLE_ARCH_m32c_TRUE@ m32c/r8c.c.log =20 -@SIM_ENABLE_ARCH_m32r_TRUE@am__append_27 =3D $(m32r_BUILD_OUTPUTS) @SIM_ENABLE_ARCH_m32r_TRUE@am__append_28 =3D $(m32r_BUILD_OUTPUTS) -@SIM_ENABLE_ARCH_m68hc11_TRUE@am__append_29 =3D $(m68hc11_BUILD_OUTPUTS) -@SIM_ENABLE_ARCH_m68hc11_TRUE@am__append_30 =3D m68hc11/gencode -@SIM_ENABLE_ARCH_m68hc11_TRUE@am__append_31 =3D $(m68hc11_BUILD_OUTPUTS) -@SIM_ENABLE_ARCH_mn10300_TRUE@am__append_32 =3D $(mn10300_BUILD_OUTPUTS) +@SIM_ENABLE_ARCH_m32r_TRUE@am__append_29 =3D $(m32r_BUILD_OUTPUTS) +@SIM_ENABLE_ARCH_m68hc11_TRUE@am__append_30 =3D $(m68hc11_BUILD_OUTPUTS) +@SIM_ENABLE_ARCH_m68hc11_TRUE@am__append_31 =3D m68hc11/gencode +@SIM_ENABLE_ARCH_m68hc11_TRUE@am__append_32 =3D $(m68hc11_BUILD_OUTPUTS) @SIM_ENABLE_ARCH_mn10300_TRUE@am__append_33 =3D $(mn10300_BUILD_OUTPUTS) -@SIM_ENABLE_ARCH_moxie_TRUE@am__append_34 =3D moxie/$(am__dirstamp) -@SIM_ENABLE_ARCH_or1k_TRUE@am__append_35 =3D $(or1k_BUILD_OUTPUTS) +@SIM_ENABLE_ARCH_mn10300_TRUE@am__append_34 =3D $(mn10300_BUILD_OUTPUTS) +@SIM_ENABLE_ARCH_moxie_TRUE@am__append_35 =3D moxie/$(am__dirstamp) @SIM_ENABLE_ARCH_or1k_TRUE@am__append_36 =3D $(or1k_BUILD_OUTPUTS) -@SIM_ENABLE_ARCH_sh_TRUE@am__append_37 =3D $(sh_BUILD_OUTPUTS) -@SIM_ENABLE_ARCH_sh_TRUE@am__append_38 =3D sh/gencode -@SIM_ENABLE_ARCH_sh_TRUE@am__append_39 =3D $(sh_BUILD_OUTPUTS) -@SIM_ENABLE_ARCH_v850_TRUE@am__append_40 =3D $(v850_BUILD_OUTPUTS) +@SIM_ENABLE_ARCH_or1k_TRUE@am__append_37 =3D $(or1k_BUILD_OUTPUTS) +@SIM_ENABLE_ARCH_sh_TRUE@am__append_38 =3D $(sh_BUILD_OUTPUTS) +@SIM_ENABLE_ARCH_sh_TRUE@am__append_39 =3D sh/gencode +@SIM_ENABLE_ARCH_sh_TRUE@am__append_40 =3D $(sh_BUILD_OUTPUTS) @SIM_ENABLE_ARCH_v850_TRUE@am__append_41 =3D $(v850_BUILD_OUTPUTS) +@SIM_ENABLE_ARCH_v850_TRUE@am__append_42 =3D $(v850_BUILD_OUTPUTS) subdir =3D . ACLOCAL_M4 =3D $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps =3D $(top_srcdir)/../config/acx.m4 \ @@ -922,13 +923,13 @@ CLEANFILES =3D common/version.c common/version.c-stam= p \ testsuite/common/bits-gen testsuite/common/bits32m0.c \ testsuite/common/bits32m31.c testsuite/common/bits64m0.c \ testsuite/common/bits64m63.c -DISTCLEANFILES =3D $(am__append_34) +DISTCLEANFILES =3D $(am__append_35) MOSTLYCLEANFILES =3D core $(am__append_5) site-sim-config.exp \ testrun.log testrun.sum $(am__append_7) $(am__append_10) \ - $(am__append_13) $(am__append_16) $(am__append_19) \ - $(am__append_21) $(am__append_23) $(am__append_26) \ - $(am__append_28) $(am__append_31) $(am__append_33) \ - $(am__append_36) $(am__append_39) $(am__append_41) + $(am__append_13) $(am__append_16) $(am__append_20) \ + $(am__append_22) $(am__append_24) $(am__append_27) \ + $(am__append_29) $(am__append_32) $(am__append_34) \ + $(am__append_37) $(am__append_40) $(am__append_42) AM_CFLAGS =3D $(WERROR_CFLAGS) $(WARN_CFLAGS) AM_CPPFLAGS =3D $(INCGNU) -I$(srcroot)/include -I../bfd -I.. \ $(SIM_HW_CFLAGS) $(SIM_INLINE) -I$(srcdir)/common \ @@ -939,12 +940,13 @@ COMPILE_FOR_BUILD =3D $(CC_FOR_BUILD) $(AM_CPPFLAGS_F= OR_BUILD) $(CPPFLAGS_FOR_BUIL LINK_FOR_BUILD =3D $(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) $(LDFLAGS_FOR_BUILD= ) -o $@ SIM_ALL_RECURSIVE_DEPS =3D common/libcommon.a $(am__append_2) \ $(am__append_6) $(am__append_8) $(am__append_12) \ - $(am__append_14) $(am__append_18) $(am__append_20) \ - $(am__append_22) $(am__append_24) $(am__append_27) \ - $(am__append_29) $(am__append_32) $(am__append_35) \ - $(am__append_37) $(am__append_40) + $(am__append_14) $(am__append_19) $(am__append_21) \ + $(am__append_23) $(am__append_25) $(am__append_28) \ + $(am__append_30) $(am__append_33) $(am__append_36) \ + $(am__append_38) $(am__append_41) SIM_INSTALL_DATA_LOCAL_DEPS =3D=20 SIM_INSTALL_EXEC_LOCAL_DEPS =3D $(am__append_17) +SIM_UNINSTALL_LOCAL_DEPS =3D $(am__append_18) common_libcommon_a_SOURCES =3D \ common/callback.c \ common/portability.c \ @@ -2268,7 +2270,7 @@ ps: ps-recursive ps-am: =20 uninstall-am: uninstall-armdocDATA uninstall-dtbDATA \ - uninstall-erc32docDATA uninstall-frvdocDATA \ + uninstall-erc32docDATA uninstall-frvdocDATA uninstall-local \ uninstall-or1kdocDATA uninstall-pkgincludeHEADERS \ uninstall-ppcdocDATA uninstall-rxdocDATA =20 @@ -2294,7 +2296,7 @@ uninstall-am: uninstall-armdocDATA uninstall-dtbDATA \ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ recheck tags tags-am uninstall uninstall-am \ uninstall-armdocDATA uninstall-dtbDATA uninstall-erc32docDATA \ - uninstall-frvdocDATA uninstall-or1kdocDATA \ + uninstall-frvdocDATA uninstall-local uninstall-or1kdocDATA \ uninstall-pkgincludeHEADERS uninstall-ppcdocDATA \ uninstall-rxdocDATA =20 @@ -2504,6 +2506,8 @@ testsuite/common/bits64m63.c: testsuite/common/bits-g= en$(EXEEXT) testsuite/commo @SIM_ENABLE_ARCH_erc32_TRUE@ $(AM_V_at)$(MKDIR_P) $(DESTDIR)$(bindir) @SIM_ENABLE_ARCH_erc32_TRUE@ n=3D`echo sis | sed '$(program_transform_name= )'`; \ @SIM_ENABLE_ARCH_erc32_TRUE@ $(INSTALL_PROGRAM) erc32/sis$(EXEEXT) $(DESTD= IR)$(bindir)/$$n$(EXEEXT) +@SIM_ENABLE_ARCH_erc32_TRUE@sim-erc32-uninstall-local: +@SIM_ENABLE_ARCH_erc32_TRUE@ rm -f $(DESTDIR)$(bindir)/sis =20 @SIM_ENABLE_ARCH_frv_TRUE@frv/mloop.c frv/eng.h: frv/stamp-mloop ; @true @SIM_ENABLE_ARCH_frv_TRUE@frv/stamp-mloop: $(srccom)/genmloop.sh frv/mloop= .in @@ -2749,6 +2753,12 @@ install-exec-local: installdirs $(SIM_INSTALL_EXEC_L= OCAL_DEPS) fi; \ done =20 +uninstall-local: $(SIM_UNINSTALL_LOCAL_DEPS) + rm -f $(DESTDIR)$(bindir)/run $(DESTDIR)$(libdir)/libsim.a + for d in $(SUBDIRS); do \ + rm -f $(DESTDIR)$(bindir)/run-$$d $(DESTDIR)$(libdir)/libsim-$$d.a; \ + done + # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: diff --git a/sim/common/Make-common.in b/sim/common/Make-common.in index c424fe7054b..2cdf357d881 100644 --- a/sim/common/Make-common.in +++ b/sim/common/Make-common.in @@ -307,6 +307,7 @@ stamp-modules: Makefile $(SIM_OBJS:.o=3D.c) =20 install: installdirs: +uninstall: =20 check: =20 diff --git a/sim/erc32/local.mk b/sim/erc32/local.mk index 3b858a671d8..36baeb96614 100644 --- a/sim/erc32/local.mk +++ b/sim/erc32/local.mk @@ -23,3 +23,7 @@ sim-%D-install-exec-local: installdirs $(AM_V_at)$(MKDIR_P) $(DESTDIR)$(bindir) n=3D`echo sis | sed '$(program_transform_name)'`; \ $(INSTALL_PROGRAM) %D%/sis$(EXEEXT) $(DESTDIR)$(bindir)/$$n$(EXEEXT) + +SIM_UNINSTALL_LOCAL_DEPS +=3D sim-%D%-uninstall-local +sim-%D%-uninstall-local: + rm -f $(DESTDIR)$(bindir)/sis diff --git a/sim/ppc/Makefile.in b/sim/ppc/Makefile.in index 4fe4fd9597c..d7b9df0819f 100644 --- a/sim/ppc/Makefile.in +++ b/sim/ppc/Makefile.in @@ -845,3 +845,4 @@ install-pdf: =20 install: installdirs: +uninstall: