Radish alpha
H
HardenedBSD-pkg
rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9
HardenedBSD Package Manager
Radicle
Git
Commits › 8578dea
Simplify a bit makefiles and kill set-version target
Baptiste Daroussin committed 13 years ago
commit 8578dea4e5f64d8f23986eab3ed397d35d1fe864
parent 4324be1
4 files changed +19 -32
modified Makefile
@@ -3,8 +3,6 @@ SUBDIR= external \
	libpkg \

	pkg
- 
SUBDIR_TARGETS=	set-version
- 


NEWVERS=	newvers.sh



CLEANFILES=	Doxyfile
@@ -19,10 +17,9 @@ PKGVERSION!= sh ${NEWVERS} pkg
# Changes to these sources will be commited to git unconditionally as

# part of the 'release' target.
- 
VERSIONED_FILES=	Doxyfile.in \
- 
			libpkg/pkg.h.in \
- 
			libpkg/pkg.pc.in \
- 
			${NEWVERS}
+ 
VERSIONED_FILES=	${NEWVERS}
+
+ 
CLEANFILES=		Doxyfile



# Set CREATE_SNAPSHOT=yes to create a snapshot, which will update

# Doxyfile, libpkg/pkg.h etc. without needing any modifications to
@@ -40,18 +37,13 @@ TARBALL_EXT= tar.xz
TARBALL_FILE=		${TARBALL_BASENAME}.${TARBALL_EXT}



.PHONY: release do-release set-tag make-tarball regression-test \
- 
	set-version do-set-version ${_snapshot}
+ 
	 ${_snapshot}
- 
all:	set-version
+ 
all:	Doxyfile



clean:

	rm -f ${CLEANFILES}
- 
do-set-version:
- 
	@${ECHO} "==> Update version strings (${PKGVERSION})"
-
- 
set-version: do-set-version Doxyfile
- 


regression-test: clean all

	@${ECHO} "==> Regression Test"
modified external/Makefile
@@ -5,8 +5,4 @@ SUBDIR= sqlite \
SUBDIR+= libelf

.endif
- 
.PHONY: set-version
-
- 
set-version:
- 


.include <bsd.subdir.mk>
modified libpkg/Makefile
@@ -9,7 +9,11 @@ INCLUDEDIR= ${PREFIX}/include
SHLIB_MAJOR=	0



#gr_utils.c has to be deleted as soon as it goes in base
- 
SRCS=		backup.c \
+ 
PC=		pkg.pc
+ 
PKGH=		pkg.h
+ 
SRCS=		${PC} \
+ 
		${PKGH} \
+ 
		backup.c \

		dns_utils.c \

		elfhints.c \

		fetch.c \
@@ -35,10 +39,9 @@ SRCS= backup.c \
		update.c \

		usergroup.c \

		utils.c \
- 
		plugins.c
+ 
		plugins.c \
+ 
		pkg.pc
- 
PC=	pkg.pc
- 
PKGH=	pkg.h

CLEANFILES=	${PC} ${PKGH}



NEWVERS=	../newvers.sh
@@ -108,18 +111,16 @@ NOMAN= yes


.include <bsd.lib.mk>
- 
.SUFFIXES: .pc.in .pc
+ 
.SUFFIXES: .pc.in .pc .h.in .h
- 
.PHONY:	set-version ${_snapshot}
+ 
.PHONY:	${_snapshot}
- 
set-version: ${PKGH} ${PC}
-
- 
${PKGH}: ${PKGH:S,$,.in,} ${NEWVERS} ${_snapshot}
+ 
.h.in.h: ${NEWVERS} ${_snapshot}

	sed -e 's,%%PKGVERSION%%,$(PKGVERSION),'   \

	    -e 's,%%PORTVERSION%%,$(PORTVERSION),' \
- 
	    ${.TARGET:S,$,.in,} > ${.TARGET}
+ 
	    ${.IMPSRC} > ${.TARGET}



.pc.in.pc: ${NEWVERS} ${_snapshot}

	sed -e "s,__PREFIX__,${PREFIX},g" \
- 
		-e "s,__VERSION__,${PKGVERSION},g" \
- 
		${.IMPSRC} > ${.TARGET}
+ 
	    -e "s,__VERSION__,${PKGVERSION},g" \
+ 
	    ${.IMPSRC} > ${.TARGET}
modified pkg/Makefile
@@ -96,11 +96,9 @@ MLINKS= pkg-delete.8 pkg-remove.8 \
	pkg-lock.8 pkg-unlock.8 \

	pkg.8 pkg-static.8
- 
.PHONY: fix-xrefs set-version
+ 
.PHONY: fix-xrefs



fix-xrefs:

	@./fix-xrefs ${MAN}
- 
set-version:
- 


.include <bsd.prog.mk>