Re: [hackers] [tabbed] Makefile: add xembed.1 in the dist target || Hiltjo Posthuma
On Thu, Oct 13, 2022 at 03:40:34AM +0600, NRK wrote: > On Wed, Oct 12, 2022 at 11:02:14PM +0200, g...@suckless.org wrote: > > commit 910e67db33dc295b73c1861a79d520b0bd527b2d > > Author: Hiltjo Posthuma > > AuthorDate: Wed Oct 12 22:55:21 2022 +0200 > > Commit: Hiltjo Posthuma > > CommitDate: Wed Oct 12 22:55:21 2022 +0200 > > > > Makefile: add xembed.1 in the dist target > > > > diff --git a/Makefile b/Makefile > > index 1b95d15..5c8c19e 100644 > > --- a/Makefile > > +++ b/Makefile > > @@ -37,7 +37,7 @@ dist: clean > > @echo creating dist tarball > > @mkdir -p tabbed-${VERSION} > > @cp -R LICENSE Makefile README config.def.h config.mk \ > > - tabbed.1 arg.h ${SRC} tabbed-${VERSION} > > + tabbed.1 xembed.1 arg.h ${SRC} tabbed-${VERSION} > > @tar -cf tabbed-${VERSION}.tar tabbed-${VERSION} > > @gzip tabbed-${VERSION}.tar > > @rm -rf tabbed-${VERSION} > > > > Might be worth it to use something like `git ls-files` to grab the list > of files. > > - NRK > Theres no need for a dependency on git, this way it also works when downloading the tarball and running make dist (just an example). -- Kind regards, Hiltjo
Re: [hackers] [tabbed] Makefile: add xembed.1 in the dist target || Hiltjo Posthuma
On Wed, Oct 12, 2022 at 11:02:14PM +0200, g...@suckless.org wrote: > commit 910e67db33dc295b73c1861a79d520b0bd527b2d > Author: Hiltjo Posthuma > AuthorDate: Wed Oct 12 22:55:21 2022 +0200 > Commit: Hiltjo Posthuma > CommitDate: Wed Oct 12 22:55:21 2022 +0200 > > Makefile: add xembed.1 in the dist target > > diff --git a/Makefile b/Makefile > index 1b95d15..5c8c19e 100644 > --- a/Makefile > +++ b/Makefile > @@ -37,7 +37,7 @@ dist: clean > @echo creating dist tarball > @mkdir -p tabbed-${VERSION} > @cp -R LICENSE Makefile README config.def.h config.mk \ > - tabbed.1 arg.h ${SRC} tabbed-${VERSION} > + tabbed.1 xembed.1 arg.h ${SRC} tabbed-${VERSION} > @tar -cf tabbed-${VERSION}.tar tabbed-${VERSION} > @gzip tabbed-${VERSION}.tar > @rm -rf tabbed-${VERSION} > Might be worth it to use something like `git ls-files` to grab the list of files. - NRK
Re: [hackers] [tabbed] bump version to 0.7 || Hiltjo Posthuma
On Wed, Oct 12, 2022 at 08:41:37PM +0200, Joerg Jung wrote: > Looks like the 0.7 release tarball seems > to miss the xembed.1 man page. > I guess because dist: target in makefile was not > updated to include file? > > > Am 04.10.2022 um 19:39 schrieb g...@suckless.org: > > > > commit b372f9ce28610dc8dd860abd42f9837972bc5adb > > Author: Hiltjo Posthuma > > AuthorDate: Tue Oct 4 19:38:44 2022 +0200 > > Commit: Hiltjo Posthuma > > CommitDate: Tue Oct 4 19:38:44 2022 +0200 > > > >bump version to 0.7 > > > > diff --git a/config.mk b/config.mk > > index 29caa84..4bd0a40 100644 > > --- a/config.mk > > +++ b/config.mk > > @@ -1,5 +1,5 @@ > > # tabbed version > > -VERSION = 0.6 > > +VERSION = 0.7 > > > > # Customize below to fit your system > > > > > > Thanks for reporting it, -- Kind regards, Hiltjo
[hackers] [tabbed] Makefile: simplify and remove hiding the build process || Hiltjo Posthuma
commit 13f13ee5827f082babb121f74ae23548bdd12dd8 Author: Hiltjo Posthuma AuthorDate: Wed Oct 12 23:01:03 2022 +0200 Commit: Hiltjo Posthuma CommitDate: Wed Oct 12 23:01:03 2022 +0200 Makefile: simplify and remove hiding the build process diff --git a/Makefile b/Makefile index 5c8c19e..0069372 100644 --- a/Makefile +++ b/Makefile @@ -16,50 +16,41 @@ options: @echo "CC = ${CC}" .c.o: - @echo CC $< - @${CC} -c ${CFLAGS} $< + ${CC} -c ${CFLAGS} $< ${OBJ}: config.h config.mk config.h: - @echo creating $@ from config.def.h - @cp config.def.h $@ + cp config.def.h $@ .o: - @echo CC -o $@ - @${CC} -o $@ $< ${LDFLAGS} + ${CC} -o $@ $< ${LDFLAGS} clean: - @echo cleaning - @rm -f ${BIN} ${OBJ} tabbed-${VERSION}.tar.gz + rm -f ${BIN} ${OBJ} tabbed-${VERSION}.tar.gz dist: clean - @echo creating dist tarball - @mkdir -p tabbed-${VERSION} - @cp -R LICENSE Makefile README config.def.h config.mk \ + mkdir -p tabbed-${VERSION} + cp -R LICENSE Makefile README config.def.h config.mk \ tabbed.1 xembed.1 arg.h ${SRC} tabbed-${VERSION} - @tar -cf tabbed-${VERSION}.tar tabbed-${VERSION} - @gzip tabbed-${VERSION}.tar - @rm -rf tabbed-${VERSION} + tar -cf tabbed-${VERSION}.tar tabbed-${VERSION} + gzip tabbed-${VERSION}.tar + rm -rf tabbed-${VERSION} install: all - @echo installing executable files to ${DESTDIR}${PREFIX}/bin - @mkdir -p "${DESTDIR}${PREFIX}/bin" - @cp -f ${BIN} "${DESTDIR}${PREFIX}/bin" - @chmod 755 "${DESTDIR}${PREFIX}/bin/tabbed" - @echo installing manual pages to ${DESTDIR}${MANPREFIX}/man1 - @mkdir -p "${DESTDIR}${MANPREFIX}/man1" - @sed "s/VERSION/${VERSION}/g" < tabbed.1 > "${DESTDIR}${MANPREFIX}/man1/tabbed.1" - @chmod 644 "${DESTDIR}${MANPREFIX}/man1/tabbed.1" - @sed "s/VERSION/${VERSION}/g" < xembed.1 > "${DESTDIR}${MANPREFIX}/man1/xembed.1" - @chmod 644 "${DESTDIR}${MANPREFIX}/man1/xembed.1" + mkdir -p "${DESTDIR}${PREFIX}/bin" + cp -f ${BIN} "${DESTDIR}${PREFIX}/bin" + chmod 755 "${DESTDIR}${PREFIX}/bin/tabbed" + mkdir -p "${DESTDIR}${MANPREFIX}/man1" + sed "s/VERSION/${VERSION}/g" < tabbed.1 > "${DESTDIR}${MANPREFIX}/man1/tabbed.1" + chmod 644 "${DESTDIR}${MANPREFIX}/man1/tabbed.1" + sed "s/VERSION/${VERSION}/g" < xembed.1 > "${DESTDIR}${MANPREFIX}/man1/xembed.1" + chmod 644 "${DESTDIR}${MANPREFIX}/man1/xembed.1" uninstall: - @echo removing executable files from ${DESTDIR}${PREFIX}/bin - @rm -f "${DESTDIR}${PREFIX}/bin/tabbed" - @rm -f "${DESTDIR}${PREFIX}/bin/xembed" - @echo removing manual pages from ${DESTDIR}${MANPREFIX}/man1 - @rm -f "${DESTDIR}${MANPREFIX}/man1/tabbed.1" - @rm -f "${DESTDIR}${MANPREFIX}/man1/xembed.1" + rm -f "${DESTDIR}${PREFIX}/bin/tabbed"\ + "${DESTDIR}${PREFIX}/bin/xembed"\ + "${DESTDIR}${MANPREFIX}/man1/tabbed.1"\ + "${DESTDIR}${MANPREFIX}/man1/xembed.1" .PHONY: all options clean dist install uninstall diff --git a/config.mk b/config.mk index 4bd0a40..e69209e 100644 --- a/config.mk +++ b/config.mk @@ -1,8 +1,6 @@ # tabbed version VERSION = 0.7 -# Customize below to fit your system - # paths PREFIX = /usr/local MANPREFIX = ${PREFIX}/share/man @@ -25,9 +23,5 @@ CPPFLAGS = -DVERSION=\"${VERSION}\" -D_DEFAULT_SOURCE CFLAGS = -std=c99 -pedantic -Wall -Os ${INCS} ${CPPFLAGS} LDFLAGS = -s ${LIBS} -# Solaris -#CFLAGS = -fast ${INCS} -DVERSION=\"${VERSION}\" -#LDFLAGS = ${LIBS} - # compiler and linker CC = cc
[hackers] [tabbed] Makefile: add xembed.1 in the dist target || Hiltjo Posthuma
commit 910e67db33dc295b73c1861a79d520b0bd527b2d Author: Hiltjo Posthuma AuthorDate: Wed Oct 12 22:55:21 2022 +0200 Commit: Hiltjo Posthuma CommitDate: Wed Oct 12 22:55:21 2022 +0200 Makefile: add xembed.1 in the dist target diff --git a/Makefile b/Makefile index 1b95d15..5c8c19e 100644 --- a/Makefile +++ b/Makefile @@ -37,7 +37,7 @@ dist: clean @echo creating dist tarball @mkdir -p tabbed-${VERSION} @cp -R LICENSE Makefile README config.def.h config.mk \ - tabbed.1 arg.h ${SRC} tabbed-${VERSION} + tabbed.1 xembed.1 arg.h ${SRC} tabbed-${VERSION} @tar -cf tabbed-${VERSION}.tar tabbed-${VERSION} @gzip tabbed-${VERSION}.tar @rm -rf tabbed-${VERSION}
Re: [hackers] [tabbed] bump version to 0.7 || Hiltjo Posthuma
Looks like the 0.7 release tarball seems to miss the xembed.1 man page. I guess because dist: target in makefile was not updated to include file? > Am 04.10.2022 um 19:39 schrieb g...@suckless.org: > > commit b372f9ce28610dc8dd860abd42f9837972bc5adb > Author: Hiltjo Posthuma > AuthorDate: Tue Oct 4 19:38:44 2022 +0200 > Commit: Hiltjo Posthuma > CommitDate: Tue Oct 4 19:38:44 2022 +0200 > >bump version to 0.7 > > diff --git a/config.mk b/config.mk > index 29caa84..4bd0a40 100644 > --- a/config.mk > +++ b/config.mk > @@ -1,5 +1,5 @@ > # tabbed version > -VERSION = 0.6 > +VERSION = 0.7 > > # Customize below to fit your system > >