Hi Dmitry,
On Thu, 2020-12-10 at 13:30 +0300, Dmitry V. Levin wrote:
> On Thu, Dec 10, 2020 at 11:09:21AM +0100, Mark Wielaard wrote:
> > Very nice. I have one small issue, with automake 1.13.4 when removing
> > the lib{asm,dw,elf}_so_SOURCES variables no clean rule is generated
> > anymore for these files. So make clean leaves the .so behind. This is
> > easily fixed by adding them to CLEANFILES.
>
> Sorry, haven't tested this with distcheck, thank you for noticing.
>
> > Does the attached variant work for you?
>
> Yes, with a few very minor ChangeLog and commit message corrections, see
> below.
> [...]
> > Fix this by renaming noinst_PROGRAMS to noinst_DATA and removing no
> > longer needed lib{asm,dw,elf}_so_SOURCES variables and add
> > lib{asm,dw,elf).so
> > to CLEANFILES.
>
> "add lib{asm,dw,elf).so.1", lib{asm,dw,elf).so are already there.
It is the other way around. It might be because I added
lib{asm,dw,elf).so before the existing lib{asm,dw,elf).so.1 that the
diff looks like it is adding the .1 variants.
> > diff --git a/libasm/ChangeLog b/libasm/ChangeLog
> > index 29c23bad..5e95b99e 100644
> > --- a/libasm/ChangeLog
> > +++ b/libasm/ChangeLog
> > @@ -1,3 +1,9 @@
> > +2020-12-09 Dmitry V. Levin <l...@altlinux.org>
> > +
> > + * Makefile.am (noinst_PROGRAMS): Rename to noinst_DATA.
> > + (libasm_so_SOURCES): Remove.
> > + (CLEANFILES): Add libelf.so.
>
> Add libasm.so.$(VERSION).
> [...]
> > @@ -87,4 +86,4 @@ uninstall: uninstall-am
> > noinst_HEADERS = libasmP.h symbolhash.h
> > EXTRA_DIST = libasm.map
> >
> > -CLEANFILES += $(am_libasm_pic_a_OBJECTS) libasm.so.$(VERSION)
> > +CLEANFILES += $(am_libasm_pic_a_OBJECTS) libasm.so libasm.so.$(VERSION)
Look, libasm.so was inserted before libasm.so.$(VERSION)
All these Makefiles do define VERSION = 1.
Cheers,
Mark
