* Re: [PATCH] modula2/108462 - duplicate install of static modula2 target libs
@ 2023-01-31 10:46 Richard Biener
2023-01-31 13:16 ` Gaius Mulley
0 siblings, 1 reply; 3+ messages in thread
From: Richard Biener @ 2023-01-31 10:46 UTC (permalink / raw)
To: gcc-patches; +Cc: gaiusmod2
On Mon, 23 Jan 2023, Richard Biener wrote:
> The following addresses the fact that libgm2 installs static libraries
> into two places, one performed by
>
> toolexeclib_LTLIBRARIES = libm2cor.la
>
> and one performed as part of the install-data-local rule to a
> m2/m2cor subdirectory alongside Modula-2 .def and .mod files.
>
> This patch opts to keep the copy installed by libtool and removes
> the extra installs in the install-data-local rules.
>
> I've built and installed both with and without
> --enable-version-specific-runtime-libs and compiled and linked
> a Modula-2 testcase with the installed compiler with the two
> multilibs and with and without static successfully.
>
> OK for trunk?
Ping.
> Thanks,
> Richard.
>
> PR modula2/108462
> libgm2/
> * libm2cor/Makefile.am: Remove static lib install from
> install-data-local.
> * libm2iso/Makefile.am: Likewise.
> * libm2log/Makefile.am: Likewise.
> * libm2min/Makefile.am: Likewise.
> * libm2pim/Makefile.am: Likewise.
> * libm2cor/Makefile.in: Regenerate.
> * libm2iso/Makefile.in: Likewise.
> * libm2log/Makefile.in: Likewise.
> * libm2min/Makefile.in: Likewise.
> * libm2pim/Makefile.in: Likewise.
> ---
> libgm2/libm2cor/Makefile.am | 5 -----
> libgm2/libm2cor/Makefile.in | 5 -----
> libgm2/libm2iso/Makefile.am | 5 -----
> libgm2/libm2iso/Makefile.in | 5 -----
> libgm2/libm2log/Makefile.am | 5 -----
> libgm2/libm2log/Makefile.in | 5 -----
> libgm2/libm2min/Makefile.am | 5 -----
> libgm2/libm2min/Makefile.in | 5 -----
> libgm2/libm2pim/Makefile.am | 4 ----
> libgm2/libm2pim/Makefile.in | 4 ----
> 10 files changed, 48 deletions(-)
>
> diff --git a/libgm2/libm2cor/Makefile.am b/libgm2/libm2cor/Makefile.am
> index 2cc30847849..2624a7d469f 100644
> --- a/libgm2/libm2cor/Makefile.am
> +++ b/libgm2/libm2cor/Makefile.am
> @@ -140,11 +140,6 @@ SYSTEM.def: Makefile
>
> install-data-local: force
> mkdir -p $(DESTDIR)$(inst_libdir)/$(M2LIBDIR)
> - $(INSTALL_DATA) .libs/libm2cor.la $(DESTDIR)$(inst_libdir)/$(M2LIBDIR)
> - chmod 644 $(DESTDIR)$(inst_libdir)/$(M2LIBDIR)libm2cor.la
> - $(INSTALL_DATA) .libs/libm2cor.a $(DESTDIR)$(inst_libdir)/$(M2LIBDIR)
> - chmod 644 $(DESTDIR)$(inst_libdir)/$(M2LIBDIR)libm2cor.a
> - $(RANLIB) $(DESTDIR)$(inst_libdir)/$(M2LIBDIR)libm2cor.a
> for i in $(M2DEFS) $(M2MODS) ; do \
> if [ -f $$i ] ; then \
> $(INSTALL_DATA) $$i '$(DESTDIR)$(inst_libdir)/$(M2LIBDIR)'; \
> diff --git a/libgm2/libm2cor/Makefile.in b/libgm2/libm2cor/Makefile.in
> index 8806d7bccf6..4869e99c64e 100644
> --- a/libgm2/libm2cor/Makefile.in
> +++ b/libgm2/libm2cor/Makefile.in
> @@ -806,11 +806,6 @@ uninstall-am: uninstall-toolexeclibLTLIBRARIES
>
> @BUILD_CORLIB_TRUE@install-data-local: force
> @BUILD_CORLIB_TRUE@ mkdir -p $(DESTDIR)$(inst_libdir)/$(M2LIBDIR)
> -@BUILD_CORLIB_TRUE@ $(INSTALL_DATA) .libs/libm2cor.la $(DESTDIR)$(inst_libdir)/$(M2LIBDIR)
> -@BUILD_CORLIB_TRUE@ chmod 644 $(DESTDIR)$(inst_libdir)/$(M2LIBDIR)libm2cor.la
> -@BUILD_CORLIB_TRUE@ $(INSTALL_DATA) .libs/libm2cor.a $(DESTDIR)$(inst_libdir)/$(M2LIBDIR)
> -@BUILD_CORLIB_TRUE@ chmod 644 $(DESTDIR)$(inst_libdir)/$(M2LIBDIR)libm2cor.a
> -@BUILD_CORLIB_TRUE@ $(RANLIB) $(DESTDIR)$(inst_libdir)/$(M2LIBDIR)libm2cor.a
> @BUILD_CORLIB_TRUE@ for i in $(M2DEFS) $(M2MODS) ; do \
> @BUILD_CORLIB_TRUE@ if [ -f $$i ] ; then \
> @BUILD_CORLIB_TRUE@ $(INSTALL_DATA) $$i '$(DESTDIR)$(inst_libdir)/$(M2LIBDIR)'; \
> diff --git a/libgm2/libm2iso/Makefile.am b/libgm2/libm2iso/Makefile.am
> index a28cd5ac8aa..b5962d9c72c 100644
> --- a/libgm2/libm2iso/Makefile.am
> +++ b/libgm2/libm2iso/Makefile.am
> @@ -220,11 +220,6 @@ SYSTEM.def: Makefile
>
> install-data-local: force
> mkdir -p $(DESTDIR)$(inst_libdir)/$(M2LIBDIR)
> - $(INSTALL_DATA) .libs/libm2iso.la $(DESTDIR)$(inst_libdir)/$(M2LIBDIR)
> - chmod 644 $(DESTDIR)$(inst_libdir)/$(M2LIBDIR)libm2iso.la
> - $(INSTALL_DATA) .libs/libm2iso.a $(DESTDIR)$(inst_libdir)/$(M2LIBDIR)
> - chmod 644 $(DESTDIR)$(inst_libdir)/$(M2LIBDIR)/libm2iso.a
> - $(RANLIB) $(DESTDIR)$(inst_libdir)/$(M2LIBDIR)/libm2iso.a
> for i in $(M2DEFS) $(M2MODS) ; do \
> if [ -f $$i ] ; then \
> $(INSTALL_DATA) $$i '$(DESTDIR)$(inst_libdir)/$(M2LIBDIR)'; \
> diff --git a/libgm2/libm2iso/Makefile.in b/libgm2/libm2iso/Makefile.in
> index 0ca852a6124..cd65d6cad56 100644
> --- a/libgm2/libm2iso/Makefile.in
> +++ b/libgm2/libm2iso/Makefile.in
> @@ -919,11 +919,6 @@ uninstall-am: uninstall-toolexeclibLTLIBRARIES
>
> @BUILD_ISOLIB_TRUE@install-data-local: force
> @BUILD_ISOLIB_TRUE@ mkdir -p $(DESTDIR)$(inst_libdir)/$(M2LIBDIR)
> -@BUILD_ISOLIB_TRUE@ $(INSTALL_DATA) .libs/libm2iso.la $(DESTDIR)$(inst_libdir)/$(M2LIBDIR)
> -@BUILD_ISOLIB_TRUE@ chmod 644 $(DESTDIR)$(inst_libdir)/$(M2LIBDIR)libm2iso.la
> -@BUILD_ISOLIB_TRUE@ $(INSTALL_DATA) .libs/libm2iso.a $(DESTDIR)$(inst_libdir)/$(M2LIBDIR)
> -@BUILD_ISOLIB_TRUE@ chmod 644 $(DESTDIR)$(inst_libdir)/$(M2LIBDIR)/libm2iso.a
> -@BUILD_ISOLIB_TRUE@ $(RANLIB) $(DESTDIR)$(inst_libdir)/$(M2LIBDIR)/libm2iso.a
> @BUILD_ISOLIB_TRUE@ for i in $(M2DEFS) $(M2MODS) ; do \
> @BUILD_ISOLIB_TRUE@ if [ -f $$i ] ; then \
> @BUILD_ISOLIB_TRUE@ $(INSTALL_DATA) $$i '$(DESTDIR)$(inst_libdir)/$(M2LIBDIR)'; \
> diff --git a/libgm2/libm2log/Makefile.am b/libgm2/libm2log/Makefile.am
> index 9b28d3e3d5b..451cd3802bd 100644
> --- a/libgm2/libm2log/Makefile.am
> +++ b/libgm2/libm2log/Makefile.am
> @@ -150,11 +150,6 @@ M2LIBDIR = /m2/m2log/
>
> install-data-local: force
> mkdir -p $(DESTDIR)$(inst_libdir)/$(M2LIBDIR)
> - $(INSTALL_DATA) .libs/libm2log.la $(DESTDIR)$(inst_libdir)/$(M2LIBDIR)
> - chmod 644 $(DESTDIR)$(inst_libdir)/$(M2LIBDIR)libm2log.la
> - $(INSTALL_DATA) .libs/libm2log.a $(DESTDIR)$(inst_libdir)/$(M2LIBDIR)
> - chmod 644 $(DESTDIR)$(inst_libdir)/$(M2LIBDIR)libm2log.a
> - $(RANLIB) $(DESTDIR)$(inst_libdir)/$(M2LIBDIR)libm2log.a
> for i in $(M2DEFS) $(M2MODS) ; do \
> if [ -f $$i ] ; then \
> $(INSTALL_DATA) $$i '$(DESTDIR)$(inst_libdir)/$(M2LIBDIR)'; \
> diff --git a/libgm2/libm2log/Makefile.in b/libgm2/libm2log/Makefile.in
> index 5afee42c31b..33bbc93e3a7 100644
> --- a/libgm2/libm2log/Makefile.in
> +++ b/libgm2/libm2log/Makefile.in
> @@ -783,11 +783,6 @@ uninstall-am: uninstall-toolexeclibLTLIBRARIES
>
> @BUILD_LOGLIB_TRUE@install-data-local: force
> @BUILD_LOGLIB_TRUE@ mkdir -p $(DESTDIR)$(inst_libdir)/$(M2LIBDIR)
> -@BUILD_LOGLIB_TRUE@ $(INSTALL_DATA) .libs/libm2log.la $(DESTDIR)$(inst_libdir)/$(M2LIBDIR)
> -@BUILD_LOGLIB_TRUE@ chmod 644 $(DESTDIR)$(inst_libdir)/$(M2LIBDIR)libm2log.la
> -@BUILD_LOGLIB_TRUE@ $(INSTALL_DATA) .libs/libm2log.a $(DESTDIR)$(inst_libdir)/$(M2LIBDIR)
> -@BUILD_LOGLIB_TRUE@ chmod 644 $(DESTDIR)$(inst_libdir)/$(M2LIBDIR)libm2log.a
> -@BUILD_LOGLIB_TRUE@ $(RANLIB) $(DESTDIR)$(inst_libdir)/$(M2LIBDIR)libm2log.a
> @BUILD_LOGLIB_TRUE@ for i in $(M2DEFS) $(M2MODS) ; do \
> @BUILD_LOGLIB_TRUE@ if [ -f $$i ] ; then \
> @BUILD_LOGLIB_TRUE@ $(INSTALL_DATA) $$i '$(DESTDIR)$(inst_libdir)/$(M2LIBDIR)'; \
> diff --git a/libgm2/libm2min/Makefile.am b/libgm2/libm2min/Makefile.am
> index bbbf3d4f943..a2545fca846 100644
> --- a/libgm2/libm2min/Makefile.am
> +++ b/libgm2/libm2min/Makefile.am
> @@ -133,11 +133,6 @@ SYSTEM.def: Makefile
>
> install-data-local: force
> mkdir -p $(DESTDIR)$(inst_libdir)/$(M2LIBDIR)
> - $(INSTALL_DATA) .libs/libm2min.la $(DESTDIR)$(inst_libdir)/$(M2LIBDIR)
> - chmod 644 $(DESTDIR)$(inst_libdir)/$(M2LIBDIR)libm2min.la
> - $(INSTALL_DATA) .libs/libm2min.a $(DESTDIR)$(inst_libdir)/$(M2LIBDIR)
> - chmod 644 $(DESTDIR)$(inst_libdir)/$(M2LIBDIR)libm2min.a
> - $(RANLIB) $(DESTDIR)$(inst_libdir)/$(M2LIBDIR)libm2min.a
> for i in $(M2DEFS) $(M2MODS) ; do \
> if [ -f $$i ] ; then \
> $(INSTALL_DATA) $$i '$(DESTDIR)$(inst_libdir)/$(M2LIBDIR)'; \
> diff --git a/libgm2/libm2min/Makefile.in b/libgm2/libm2min/Makefile.in
> index ad818bc01d5..e62f5d9f0bb 100644
> --- a/libgm2/libm2min/Makefile.in
> +++ b/libgm2/libm2min/Makefile.in
> @@ -759,11 +759,6 @@ SYSTEM.def: Makefile
>
> install-data-local: force
> mkdir -p $(DESTDIR)$(inst_libdir)/$(M2LIBDIR)
> - $(INSTALL_DATA) .libs/libm2min.la $(DESTDIR)$(inst_libdir)/$(M2LIBDIR)
> - chmod 644 $(DESTDIR)$(inst_libdir)/$(M2LIBDIR)libm2min.la
> - $(INSTALL_DATA) .libs/libm2min.a $(DESTDIR)$(inst_libdir)/$(M2LIBDIR)
> - chmod 644 $(DESTDIR)$(inst_libdir)/$(M2LIBDIR)libm2min.a
> - $(RANLIB) $(DESTDIR)$(inst_libdir)/$(M2LIBDIR)libm2min.a
> for i in $(M2DEFS) $(M2MODS) ; do \
> if [ -f $$i ] ; then \
> $(INSTALL_DATA) $$i '$(DESTDIR)$(inst_libdir)/$(M2LIBDIR)'; \
> diff --git a/libgm2/libm2pim/Makefile.am b/libgm2/libm2pim/Makefile.am
> index 35fefae59c1..aa4c4c89bfc 100644
> --- a/libgm2/libm2pim/Makefile.am
> +++ b/libgm2/libm2pim/Makefile.am
> @@ -193,10 +193,6 @@ SYSTEM.def: Makefile
>
> install-data-local: force
> mkdir -p $(DESTDIR)$(inst_libdir)/$(M2LIBDIR)
> - $(INSTALL_DATA) .libs/libm2pim.la $(DESTDIR)$(inst_libdir)/$(M2LIBDIR)
> - chmod 644 $(DESTDIR)$(inst_libdir)/$(M2LIBDIR)libm2pim.la
> - $(INSTALL_DATA) .libs/libm2pim.a $(DESTDIR)$(inst_libdir)/$(M2LIBDIR)
> - $(RANLIB) $(DESTDIR)$(inst_libdir)/$(M2LIBDIR)libm2pim.a
> for i in $(M2DEFS) $(M2MODS) ; do \
> if [ -f $$i ] ; then \
> $(INSTALL_DATA) $$i '$(DESTDIR)$(inst_libdir)/$(M2LIBDIR)'; \
> diff --git a/libgm2/libm2pim/Makefile.in b/libgm2/libm2pim/Makefile.in
> index 85754b6195b..7d81a7a86fc 100644
> --- a/libgm2/libm2pim/Makefile.in
> +++ b/libgm2/libm2pim/Makefile.in
> @@ -893,10 +893,6 @@ uninstall-am: uninstall-toolexeclibLTLIBRARIES
>
> @BUILD_PIMLIB_TRUE@install-data-local: force
> @BUILD_PIMLIB_TRUE@ mkdir -p $(DESTDIR)$(inst_libdir)/$(M2LIBDIR)
> -@BUILD_PIMLIB_TRUE@ $(INSTALL_DATA) .libs/libm2pim.la $(DESTDIR)$(inst_libdir)/$(M2LIBDIR)
> -@BUILD_PIMLIB_TRUE@ chmod 644 $(DESTDIR)$(inst_libdir)/$(M2LIBDIR)libm2pim.la
> -@BUILD_PIMLIB_TRUE@ $(INSTALL_DATA) .libs/libm2pim.a $(DESTDIR)$(inst_libdir)/$(M2LIBDIR)
> -@BUILD_PIMLIB_TRUE@ $(RANLIB) $(DESTDIR)$(inst_libdir)/$(M2LIBDIR)libm2pim.a
> @BUILD_PIMLIB_TRUE@ for i in $(M2DEFS) $(M2MODS) ; do \
> @BUILD_PIMLIB_TRUE@ if [ -f $$i ] ; then \
> @BUILD_PIMLIB_TRUE@ $(INSTALL_DATA) $$i '$(DESTDIR)$(inst_libdir)/$(M2LIBDIR)'; \
>
--
Richard Biener <rguenther@suse.de>
SUSE Software Solutions Germany GmbH, Frankenstrasse 146, 90461 Nuernberg,
Germany; GF: Ivo Totev, Andrew Myers, Andrew McDonald, Boudien Moerman;
HRB 36809 (AG Nuernberg)
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] modula2/108462 - duplicate install of static modula2 target libs
2023-01-31 10:46 [PATCH] modula2/108462 - duplicate install of static modula2 target libs Richard Biener
@ 2023-01-31 13:16 ` Gaius Mulley
0 siblings, 0 replies; 3+ messages in thread
From: Gaius Mulley @ 2023-01-31 13:16 UTC (permalink / raw)
To: Richard Biener; +Cc: gcc-patches
Richard Biener <rguenther@suse.de> writes:
> On Mon, 23 Jan 2023, Richard Biener wrote:
>
>> The following addresses the fact that libgm2 installs static libraries
>> into two places, one performed by
>>
>> toolexeclib_LTLIBRARIES = libm2cor.la
>>
>> and one performed as part of the install-data-local rule to a
>> m2/m2cor subdirectory alongside Modula-2 .def and .mod files.
>>
>> This patch opts to keep the copy installed by libtool and removes
>> the extra installs in the install-data-local rules.
>>
>> I've built and installed both with and without
>> --enable-version-specific-runtime-libs and compiled and linked
>> a Modula-2 testcase with the installed compiler with the two
>> multilibs and with and without static successfully.
>>
>> OK for trunk?
>
> Ping.
yes sure, LGTM
A heads up that I've just renamed the gcc/m2/gm2-libs-pim directory to
gcc/m2/gm2-libs-log for consistency. I've just tried the patch (post
rename changes) and the patch builds and installs fine (non bootstrap
test build though),
regards,
Gaius
^ permalink raw reply [flat|nested] 3+ messages in thread
* [PATCH] modula2/108462 - duplicate install of static modula2 target libs
@ 2023-01-23 10:50 Richard Biener
0 siblings, 0 replies; 3+ messages in thread
From: Richard Biener @ 2023-01-23 10:50 UTC (permalink / raw)
To: gcc-patches; +Cc: gaiusmod2
The following addresses the fact that libgm2 installs static libraries
into two places, one performed by
toolexeclib_LTLIBRARIES = libm2cor.la
and one performed as part of the install-data-local rule to a
m2/m2cor subdirectory alongside Modula-2 .def and .mod files.
This patch opts to keep the copy installed by libtool and removes
the extra installs in the install-data-local rules.
I've built and installed both with and without
--enable-version-specific-runtime-libs and compiled and linked
a Modula-2 testcase with the installed compiler with the two
multilibs and with and without static successfully.
OK for trunk?
Thanks,
Richard.
PR modula2/108462
libgm2/
* libm2cor/Makefile.am: Remove static lib install from
install-data-local.
* libm2iso/Makefile.am: Likewise.
* libm2log/Makefile.am: Likewise.
* libm2min/Makefile.am: Likewise.
* libm2pim/Makefile.am: Likewise.
* libm2cor/Makefile.in: Regenerate.
* libm2iso/Makefile.in: Likewise.
* libm2log/Makefile.in: Likewise.
* libm2min/Makefile.in: Likewise.
* libm2pim/Makefile.in: Likewise.
---
libgm2/libm2cor/Makefile.am | 5 -----
libgm2/libm2cor/Makefile.in | 5 -----
libgm2/libm2iso/Makefile.am | 5 -----
libgm2/libm2iso/Makefile.in | 5 -----
libgm2/libm2log/Makefile.am | 5 -----
libgm2/libm2log/Makefile.in | 5 -----
libgm2/libm2min/Makefile.am | 5 -----
libgm2/libm2min/Makefile.in | 5 -----
libgm2/libm2pim/Makefile.am | 4 ----
libgm2/libm2pim/Makefile.in | 4 ----
10 files changed, 48 deletions(-)
diff --git a/libgm2/libm2cor/Makefile.am b/libgm2/libm2cor/Makefile.am
index 2cc30847849..2624a7d469f 100644
--- a/libgm2/libm2cor/Makefile.am
+++ b/libgm2/libm2cor/Makefile.am
@@ -140,11 +140,6 @@ SYSTEM.def: Makefile
install-data-local: force
mkdir -p $(DESTDIR)$(inst_libdir)/$(M2LIBDIR)
- $(INSTALL_DATA) .libs/libm2cor.la $(DESTDIR)$(inst_libdir)/$(M2LIBDIR)
- chmod 644 $(DESTDIR)$(inst_libdir)/$(M2LIBDIR)libm2cor.la
- $(INSTALL_DATA) .libs/libm2cor.a $(DESTDIR)$(inst_libdir)/$(M2LIBDIR)
- chmod 644 $(DESTDIR)$(inst_libdir)/$(M2LIBDIR)libm2cor.a
- $(RANLIB) $(DESTDIR)$(inst_libdir)/$(M2LIBDIR)libm2cor.a
for i in $(M2DEFS) $(M2MODS) ; do \
if [ -f $$i ] ; then \
$(INSTALL_DATA) $$i '$(DESTDIR)$(inst_libdir)/$(M2LIBDIR)'; \
diff --git a/libgm2/libm2cor/Makefile.in b/libgm2/libm2cor/Makefile.in
index 8806d7bccf6..4869e99c64e 100644
--- a/libgm2/libm2cor/Makefile.in
+++ b/libgm2/libm2cor/Makefile.in
@@ -806,11 +806,6 @@ uninstall-am: uninstall-toolexeclibLTLIBRARIES
@BUILD_CORLIB_TRUE@install-data-local: force
@BUILD_CORLIB_TRUE@ mkdir -p $(DESTDIR)$(inst_libdir)/$(M2LIBDIR)
-@BUILD_CORLIB_TRUE@ $(INSTALL_DATA) .libs/libm2cor.la $(DESTDIR)$(inst_libdir)/$(M2LIBDIR)
-@BUILD_CORLIB_TRUE@ chmod 644 $(DESTDIR)$(inst_libdir)/$(M2LIBDIR)libm2cor.la
-@BUILD_CORLIB_TRUE@ $(INSTALL_DATA) .libs/libm2cor.a $(DESTDIR)$(inst_libdir)/$(M2LIBDIR)
-@BUILD_CORLIB_TRUE@ chmod 644 $(DESTDIR)$(inst_libdir)/$(M2LIBDIR)libm2cor.a
-@BUILD_CORLIB_TRUE@ $(RANLIB) $(DESTDIR)$(inst_libdir)/$(M2LIBDIR)libm2cor.a
@BUILD_CORLIB_TRUE@ for i in $(M2DEFS) $(M2MODS) ; do \
@BUILD_CORLIB_TRUE@ if [ -f $$i ] ; then \
@BUILD_CORLIB_TRUE@ $(INSTALL_DATA) $$i '$(DESTDIR)$(inst_libdir)/$(M2LIBDIR)'; \
diff --git a/libgm2/libm2iso/Makefile.am b/libgm2/libm2iso/Makefile.am
index a28cd5ac8aa..b5962d9c72c 100644
--- a/libgm2/libm2iso/Makefile.am
+++ b/libgm2/libm2iso/Makefile.am
@@ -220,11 +220,6 @@ SYSTEM.def: Makefile
install-data-local: force
mkdir -p $(DESTDIR)$(inst_libdir)/$(M2LIBDIR)
- $(INSTALL_DATA) .libs/libm2iso.la $(DESTDIR)$(inst_libdir)/$(M2LIBDIR)
- chmod 644 $(DESTDIR)$(inst_libdir)/$(M2LIBDIR)libm2iso.la
- $(INSTALL_DATA) .libs/libm2iso.a $(DESTDIR)$(inst_libdir)/$(M2LIBDIR)
- chmod 644 $(DESTDIR)$(inst_libdir)/$(M2LIBDIR)/libm2iso.a
- $(RANLIB) $(DESTDIR)$(inst_libdir)/$(M2LIBDIR)/libm2iso.a
for i in $(M2DEFS) $(M2MODS) ; do \
if [ -f $$i ] ; then \
$(INSTALL_DATA) $$i '$(DESTDIR)$(inst_libdir)/$(M2LIBDIR)'; \
diff --git a/libgm2/libm2iso/Makefile.in b/libgm2/libm2iso/Makefile.in
index 0ca852a6124..cd65d6cad56 100644
--- a/libgm2/libm2iso/Makefile.in
+++ b/libgm2/libm2iso/Makefile.in
@@ -919,11 +919,6 @@ uninstall-am: uninstall-toolexeclibLTLIBRARIES
@BUILD_ISOLIB_TRUE@install-data-local: force
@BUILD_ISOLIB_TRUE@ mkdir -p $(DESTDIR)$(inst_libdir)/$(M2LIBDIR)
-@BUILD_ISOLIB_TRUE@ $(INSTALL_DATA) .libs/libm2iso.la $(DESTDIR)$(inst_libdir)/$(M2LIBDIR)
-@BUILD_ISOLIB_TRUE@ chmod 644 $(DESTDIR)$(inst_libdir)/$(M2LIBDIR)libm2iso.la
-@BUILD_ISOLIB_TRUE@ $(INSTALL_DATA) .libs/libm2iso.a $(DESTDIR)$(inst_libdir)/$(M2LIBDIR)
-@BUILD_ISOLIB_TRUE@ chmod 644 $(DESTDIR)$(inst_libdir)/$(M2LIBDIR)/libm2iso.a
-@BUILD_ISOLIB_TRUE@ $(RANLIB) $(DESTDIR)$(inst_libdir)/$(M2LIBDIR)/libm2iso.a
@BUILD_ISOLIB_TRUE@ for i in $(M2DEFS) $(M2MODS) ; do \
@BUILD_ISOLIB_TRUE@ if [ -f $$i ] ; then \
@BUILD_ISOLIB_TRUE@ $(INSTALL_DATA) $$i '$(DESTDIR)$(inst_libdir)/$(M2LIBDIR)'; \
diff --git a/libgm2/libm2log/Makefile.am b/libgm2/libm2log/Makefile.am
index 9b28d3e3d5b..451cd3802bd 100644
--- a/libgm2/libm2log/Makefile.am
+++ b/libgm2/libm2log/Makefile.am
@@ -150,11 +150,6 @@ M2LIBDIR = /m2/m2log/
install-data-local: force
mkdir -p $(DESTDIR)$(inst_libdir)/$(M2LIBDIR)
- $(INSTALL_DATA) .libs/libm2log.la $(DESTDIR)$(inst_libdir)/$(M2LIBDIR)
- chmod 644 $(DESTDIR)$(inst_libdir)/$(M2LIBDIR)libm2log.la
- $(INSTALL_DATA) .libs/libm2log.a $(DESTDIR)$(inst_libdir)/$(M2LIBDIR)
- chmod 644 $(DESTDIR)$(inst_libdir)/$(M2LIBDIR)libm2log.a
- $(RANLIB) $(DESTDIR)$(inst_libdir)/$(M2LIBDIR)libm2log.a
for i in $(M2DEFS) $(M2MODS) ; do \
if [ -f $$i ] ; then \
$(INSTALL_DATA) $$i '$(DESTDIR)$(inst_libdir)/$(M2LIBDIR)'; \
diff --git a/libgm2/libm2log/Makefile.in b/libgm2/libm2log/Makefile.in
index 5afee42c31b..33bbc93e3a7 100644
--- a/libgm2/libm2log/Makefile.in
+++ b/libgm2/libm2log/Makefile.in
@@ -783,11 +783,6 @@ uninstall-am: uninstall-toolexeclibLTLIBRARIES
@BUILD_LOGLIB_TRUE@install-data-local: force
@BUILD_LOGLIB_TRUE@ mkdir -p $(DESTDIR)$(inst_libdir)/$(M2LIBDIR)
-@BUILD_LOGLIB_TRUE@ $(INSTALL_DATA) .libs/libm2log.la $(DESTDIR)$(inst_libdir)/$(M2LIBDIR)
-@BUILD_LOGLIB_TRUE@ chmod 644 $(DESTDIR)$(inst_libdir)/$(M2LIBDIR)libm2log.la
-@BUILD_LOGLIB_TRUE@ $(INSTALL_DATA) .libs/libm2log.a $(DESTDIR)$(inst_libdir)/$(M2LIBDIR)
-@BUILD_LOGLIB_TRUE@ chmod 644 $(DESTDIR)$(inst_libdir)/$(M2LIBDIR)libm2log.a
-@BUILD_LOGLIB_TRUE@ $(RANLIB) $(DESTDIR)$(inst_libdir)/$(M2LIBDIR)libm2log.a
@BUILD_LOGLIB_TRUE@ for i in $(M2DEFS) $(M2MODS) ; do \
@BUILD_LOGLIB_TRUE@ if [ -f $$i ] ; then \
@BUILD_LOGLIB_TRUE@ $(INSTALL_DATA) $$i '$(DESTDIR)$(inst_libdir)/$(M2LIBDIR)'; \
diff --git a/libgm2/libm2min/Makefile.am b/libgm2/libm2min/Makefile.am
index bbbf3d4f943..a2545fca846 100644
--- a/libgm2/libm2min/Makefile.am
+++ b/libgm2/libm2min/Makefile.am
@@ -133,11 +133,6 @@ SYSTEM.def: Makefile
install-data-local: force
mkdir -p $(DESTDIR)$(inst_libdir)/$(M2LIBDIR)
- $(INSTALL_DATA) .libs/libm2min.la $(DESTDIR)$(inst_libdir)/$(M2LIBDIR)
- chmod 644 $(DESTDIR)$(inst_libdir)/$(M2LIBDIR)libm2min.la
- $(INSTALL_DATA) .libs/libm2min.a $(DESTDIR)$(inst_libdir)/$(M2LIBDIR)
- chmod 644 $(DESTDIR)$(inst_libdir)/$(M2LIBDIR)libm2min.a
- $(RANLIB) $(DESTDIR)$(inst_libdir)/$(M2LIBDIR)libm2min.a
for i in $(M2DEFS) $(M2MODS) ; do \
if [ -f $$i ] ; then \
$(INSTALL_DATA) $$i '$(DESTDIR)$(inst_libdir)/$(M2LIBDIR)'; \
diff --git a/libgm2/libm2min/Makefile.in b/libgm2/libm2min/Makefile.in
index ad818bc01d5..e62f5d9f0bb 100644
--- a/libgm2/libm2min/Makefile.in
+++ b/libgm2/libm2min/Makefile.in
@@ -759,11 +759,6 @@ SYSTEM.def: Makefile
install-data-local: force
mkdir -p $(DESTDIR)$(inst_libdir)/$(M2LIBDIR)
- $(INSTALL_DATA) .libs/libm2min.la $(DESTDIR)$(inst_libdir)/$(M2LIBDIR)
- chmod 644 $(DESTDIR)$(inst_libdir)/$(M2LIBDIR)libm2min.la
- $(INSTALL_DATA) .libs/libm2min.a $(DESTDIR)$(inst_libdir)/$(M2LIBDIR)
- chmod 644 $(DESTDIR)$(inst_libdir)/$(M2LIBDIR)libm2min.a
- $(RANLIB) $(DESTDIR)$(inst_libdir)/$(M2LIBDIR)libm2min.a
for i in $(M2DEFS) $(M2MODS) ; do \
if [ -f $$i ] ; then \
$(INSTALL_DATA) $$i '$(DESTDIR)$(inst_libdir)/$(M2LIBDIR)'; \
diff --git a/libgm2/libm2pim/Makefile.am b/libgm2/libm2pim/Makefile.am
index 35fefae59c1..aa4c4c89bfc 100644
--- a/libgm2/libm2pim/Makefile.am
+++ b/libgm2/libm2pim/Makefile.am
@@ -193,10 +193,6 @@ SYSTEM.def: Makefile
install-data-local: force
mkdir -p $(DESTDIR)$(inst_libdir)/$(M2LIBDIR)
- $(INSTALL_DATA) .libs/libm2pim.la $(DESTDIR)$(inst_libdir)/$(M2LIBDIR)
- chmod 644 $(DESTDIR)$(inst_libdir)/$(M2LIBDIR)libm2pim.la
- $(INSTALL_DATA) .libs/libm2pim.a $(DESTDIR)$(inst_libdir)/$(M2LIBDIR)
- $(RANLIB) $(DESTDIR)$(inst_libdir)/$(M2LIBDIR)libm2pim.a
for i in $(M2DEFS) $(M2MODS) ; do \
if [ -f $$i ] ; then \
$(INSTALL_DATA) $$i '$(DESTDIR)$(inst_libdir)/$(M2LIBDIR)'; \
diff --git a/libgm2/libm2pim/Makefile.in b/libgm2/libm2pim/Makefile.in
index 85754b6195b..7d81a7a86fc 100644
--- a/libgm2/libm2pim/Makefile.in
+++ b/libgm2/libm2pim/Makefile.in
@@ -893,10 +893,6 @@ uninstall-am: uninstall-toolexeclibLTLIBRARIES
@BUILD_PIMLIB_TRUE@install-data-local: force
@BUILD_PIMLIB_TRUE@ mkdir -p $(DESTDIR)$(inst_libdir)/$(M2LIBDIR)
-@BUILD_PIMLIB_TRUE@ $(INSTALL_DATA) .libs/libm2pim.la $(DESTDIR)$(inst_libdir)/$(M2LIBDIR)
-@BUILD_PIMLIB_TRUE@ chmod 644 $(DESTDIR)$(inst_libdir)/$(M2LIBDIR)libm2pim.la
-@BUILD_PIMLIB_TRUE@ $(INSTALL_DATA) .libs/libm2pim.a $(DESTDIR)$(inst_libdir)/$(M2LIBDIR)
-@BUILD_PIMLIB_TRUE@ $(RANLIB) $(DESTDIR)$(inst_libdir)/$(M2LIBDIR)libm2pim.a
@BUILD_PIMLIB_TRUE@ for i in $(M2DEFS) $(M2MODS) ; do \
@BUILD_PIMLIB_TRUE@ if [ -f $$i ] ; then \
@BUILD_PIMLIB_TRUE@ $(INSTALL_DATA) $$i '$(DESTDIR)$(inst_libdir)/$(M2LIBDIR)'; \
--
2.35.3
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2023-01-31 13:16 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-01-31 10:46 [PATCH] modula2/108462 - duplicate install of static modula2 target libs Richard Biener
2023-01-31 13:16 ` Gaius Mulley
-- strict thread matches above, loose matches on Subject: below --
2023-01-23 10:50 Richard Biener
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).