galeb-mkfiles

чување 554b0fe3fe6ae708ae677cea8dc669d6e50d8b51
родитељ 9a4be226318f342a5727a4a28be4083d36ab65fb
Аутор: Страхиња Радић <contact@strahinja.org>
Датум:   Fri,  5 Aug 2022 11:08:43 +0200

Fix noice scripts; rearrange existing files to move static configuration into config.mk

Signed-off-by: Страхиња Радић <contact@strahinja.org>

Diffstat:
M
noice/config.mk
 | 
11
+++++++++--
M
noice/mkfile
 | 
32
+++++++++++++++++++++-----------
M
sled/config.mk
 | 
10
++++++++--
M
sled/mkfile
 | 
7
-------
M
table/config.mk
 | 
10
++++++++--
M
table/mkfile
 | 
6
------

измењених датотека: 6, додавања: 46(+), брисања: 30(-)
diff --git a/noice/config.mk b/noice/config.mk
@@ -1,4 +1,11 @@
-PREFIX=		/
+BIN=		noice nopen
+DOCS=		README
 FALLBACKVER=	0.8
+LDFLAGS=	$LDFLAGS -fcommon -zmuldefs
 LEGALFILES=	LICENSE
-DOCS=		README
+LIBS=		-lcurses -lterminfo
+MAN1=		noice.1 nopen.1
+PREFIX=		/
+SCRIPTS=	noice-lesswrap noice-rm-interactive noice-showelf
+SRC=		dprintf.c noice.c nopen.c spawn.c strlcat.c strlcpy.c strverscmp.c
+SRCREPOS=	https://git.sr.ht/~strahinja/noice
diff --git a/noice/mkfile b/noice/mkfile
@@ -11,22 +11,32 @@ PKG=		`{ if [ -z "$version" ]; then \
 			echo $PKGBASE-$version; \
 		   fi}
 
-BIN=		noice nopen
+NOICEOBJ=	dprintf.o noice.o spawn.o strlcat.o strlcpy.o strverscmp.o
+NOPENOBJ=	nopen.o spawn.o
+
+OBJ=		$NOICEOBJ $NOPENOBJ
 JUNK=		$BIN $OBJ $PKG.tar.xz $PKG.sha512 *~
-LIBS=		-lcurses
-MAN1=		noice.1 nopen.1
-OBJ=		${SRC:%.c=%.o}
-SCRIPTS=	noice-lesswrap noice-rm-interactive noice-showelf
-SRC=		dprintf.c noice.c nopen.c spawn.c strlcat.c strlcpy.c \
-		strverscmp.c
-SRCREPOS=	https://git.sr.ht/~strahinja/noice
 
 <$mkpklib/standard.mk
-<$mkpklib/c.targets.mk
+#<$mkpklib/c.targets.mk
 <$mkpklib/package.mk
 
-noiceconf.h:
+noice:Q: $NOICEOBJ
+	printf "  LD\t%s\n" $target
+	$LD $LDFLAGS -o $target $NOICEOBJ $LIBS
+
+nopen:Q: $NOPENOBJ
+	printf "  LD\t%s\n" $target
+	$LD $LDFLAGS -o $target $NOPENOBJ
+
+%.o:Q: %.c
+	printf "  CC\t%s\n" $stem.c
+	$CC $CFLAGS -o $target -c $stem.c
+
+noiceconf.h:Q:
+	printf "  CP\tdef.h %s\n" $target
 	cp noiceconf.def.h $target
 
-nopenconf.h:
+nopenconf.h:Q:
+	printf "  CP\tdef.h %s\n" $target
 	cp nopenconf.def.h $target
diff --git a/sled/config.mk b/sled/config.mk
@@ -1,6 +1,12 @@
-PREFIX=		/
+BIN=		sled
 DATEARGS=	"+%d %b %Y"
+DOCS=		README HACKING
 FALLBACKVER=	0.10.8
 GZARGS=		-9ckf
 LEGALFILES=	LICENSE LICENSE.termbox
-DOCS=		README HACKING
+MAN1U=		sled.1
+ODEPS=		version.h
+PREFIX=		/
+SCRIPTS=	sledv
+SRC=		draw.c sled.c util.c
+SRCREPOS=	https://git.sr.ht/~strahinja/sled
diff --git a/sled/mkfile b/sled/mkfile
@@ -12,16 +12,9 @@ PKG=		`{ if [ -z "$version" ]; then \
 		   else \
 			echo $PKGBASE-$version; \
 		   fi}
-
-BIN=		sled
-MAN1U=		sled.1
 MAN1=		${MAN1U:%=%.gz}
-SRC=		draw.c sled.c util.c
 OBJ=		${SRC:%.c=%.o}
-ODEPS=		version.h
-SCRIPTS=	sledv
 JUNK=		$BIN $MAN1 $MAN1U $OBJ $PKG.tar.xz $PKG.sha512 *~
-SRCREPOS=	https://git.sr.ht/~strahinja/sled
 
 <$mkpklib/standard.mk
 <$mkpklib/c.targets.mk
diff --git a/table/config.mk b/table/config.mk
@@ -1,6 +1,12 @@
-PREFIX=		/
+BIN=		table
 DATEARGS=	"+%d %b %Y"
+DOCS=		README THANKS
 FALLBACKVER=	0.6.4
 GZARGS=		-9ckf
 LEGALFILES=	LICENSE
-DOCS=		README THANKS
+MAN1U=		table.1
+ODEPS=		version.h
+PREFIX=		/
+SCRIPTS=	tablep tsvtable
+SRC=		table.c utf8.c
+SRCREPOS=	https://git.sr.ht/~strahinja/table
diff --git a/table/mkfile b/table/mkfile
@@ -13,15 +13,9 @@ PKG=		`{ if [ -z "$version" ]; then \
 			echo $PKGBASE-$version; \
 		   fi}
 
-BIN=		table
-MAN1U=		table.1
 MAN1=		${MAN1U:%=%.gz}
-SRC=		table.c utf8.c
 OBJ=		${SRC:%.c=%.o}
-ODEPS=		version.h
-SCRIPTS=	tablep tsvtable
 JUNK=		$BIN $MAN1 $MAN1U $OBJ $PKG.tar.xz $PKG.sha512 *~
-SRCREPOS=	https://git.sr.ht/~strahinja/table
 
 <$mkpklib/standard.mk
 <$mkpklib/c.targets.mk