aa92022 Makefile cleanup. — HardenedBSD-pkg

HardenedBSD Package Manager

Makefile cleanup.

jlaffaye committed 15 years ago

commit aa92022be1b943bc171a4b9b506e3e28626b8504
parent 207d900dc7617cdee6eee276636e37f92c7ee052

3 files changed +22 -19

modified Makefile

@@ -1,2 +1,5 @@

 SUBDIR= external libpkg pkg
 SUBDIR=	external \
 	libpkg \
 	pkg
 .include <bsd.subdir.mk>

modified libpkg/Makefile

@@ -7,10 +7,9 @@ SHLIBDIR?= /usr/lib

 SHLIB_MAJOR=	0
 SRCS=		pkg.c \
 		pkgdb.c \
 		pkg_add.c \
 		pkg_create.c \
 		pkg_conflict.c \
 		pkg_create.c \
 		pkg_delete.c \
 		pkg_elf.c \
 		pkg_error.c \

@@ -20,16 +19,15 @@ SRCS= pkg.c \

 		pkg_option.c \
 		pkg_ports.c \
 		pkg_repo.c \
 		pkg_util.c \
 		pkg_version.c \
 		pkg_util.c
 		pkgdb.c
 CFLAGS+=	-std=c99
 CFLAGS+=	-I${.CURDIR} \
 		-I${.CURDIR}/../external/sqlite
 LDADD+=		-L${.CURDIR}/../external/sqlite \
 		-L/usr/local/lib \
 		-lsqlite3 \
 		-lm \
 		-larchive \
 		-lz \
 		-lbz2 \

modified pkg/Makefile

@@ -1,17 +1,19 @@

 PROG=	pkg
 SRCS=	main.c \
 	delete.c \
 	info.c \
 	which.c \
 	register.c \
 	version.c \
 	add.c \
 	create.c \
 	repo.c
 PROG=		pkg
 SRCS=		add.c \
 		create.c \
 		delete.c \
 		info.c \
 		main.c \
 		register.c \
 		repo.c \
 		version.c \
 		which.c
 CFLAGS+=	-I${.CURDIR}/../libpkg
 LDADD+=	-L${.CURDIR}/../external -L../libpkg -lpkg -lutil
 WARNS?=	6
 NO_MAN= true
 LDADD+=		-L../libpkg \
 		-lpkg \
 		-lutil
 WARNS?=		6
 NO_MAN=		true
 .include <bsd.prog.mk>