diff options
| author | joerg <joerg@pkgsrc.org> | 2015-12-27 12:18:20 +0000 |
|---|---|---|
| committer | joerg <joerg@pkgsrc.org> | 2015-12-27 12:18:20 +0000 |
| commit | 6120892a3ff4703b6db76d962240b59a4ddfb478 (patch) | |
| tree | e171981b062c801c8df5a929cf52e528da33eb69 /pkgtools | |
| parent | 4a91fccd038bc35b58aec23f32b77340cef1dd9e (diff) | |
| download | pkgsrc-6120892a3ff4703b6db76d962240b59a4ddfb478.tar.gz | |
Refactor Makefiles slightly to remove redundancy between normal and
bootstrap build.
Diffstat (limited to 'pkgtools')
| -rw-r--r-- | pkgtools/pkg_install/files/admin/Makefile.in | 9 | ||||
| -rw-r--r-- | pkgtools/pkg_install/files/create/Makefile.in | 6 | ||||
| -rw-r--r-- | pkgtools/pkg_install/files/info/Makefile.in | 13 |
3 files changed, 15 insertions, 13 deletions
diff --git a/pkgtools/pkg_install/files/admin/Makefile.in b/pkgtools/pkg_install/files/admin/Makefile.in index 56cb24697c4..9c50f82aad4 100644 --- a/pkgtools/pkg_install/files/admin/Makefile.in +++ b/pkgtools/pkg_install/files/admin/Makefile.in @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.in,v 1.29 2015/09/07 09:06:05 jperkin Exp $ +# $NetBSD: Makefile.in,v 1.30 2015/12/27 12:18:20 joerg Exp $ srcdir= @srcdir@ @@ -27,19 +27,20 @@ INSTALL= @INSTALL@ PROG= pkg_admin SCRIPTS= audit-packages download-vulnerability-list +CPPFLAGS= @CPPFLAGS@ -I. -I$(srcdir) -I../lib + .if empty(BOOTSTRAP) LIBS= -linstall -lnetpgpverify -larchive -lbz2 -lz -lfetch .if !empty(SSL_SUPPORT) LIBS+= -lssl -lcrypto -CFLAGS+= -DHAVE_SSL +CPPFLAGS+= -DHAVE_SSL .endif LIBS+= @LIBS@ OBJS= audit.o check.o main.o -CPPFLAGS= @CPPFLAGS@ -I. -I$(srcdir) -I../lib .else LIBS= -linstall @LIBS@ OBJS= check.o main.o -CPPFLAGS= @CPPFLAGS@ -I. -I$(srcdir) -I../lib -DBOOTSTRAP +CPPFLAGS+= -DBOOTSTRAP .endif all: $(PROG) $(SCRIPTS) diff --git a/pkgtools/pkg_install/files/create/Makefile.in b/pkgtools/pkg_install/files/create/Makefile.in index fdd1f7b7b6d..7b606bf2a3a 100644 --- a/pkgtools/pkg_install/files/create/Makefile.in +++ b/pkgtools/pkg_install/files/create/Makefile.in @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.in,v 1.27 2015/09/07 09:06:05 jperkin Exp $ +# $NetBSD: Makefile.in,v 1.28 2015/12/27 12:18:20 joerg Exp $ srcdir= @srcdir@ @@ -24,17 +24,17 @@ INSTALL= @INSTALL@ PROG= pkg_create SSL_SUPPORT= @ssl_support@ +CPPFLAGS= @CPPFLAGS@ -I. -I$(srcdir) -I../lib .if empty(BOOTSTRAP) LIBS= -linstall -lnetpgpverify -larchive -lbz2 -lz -lfetch @LIBS@ .if !empty(SSL_SUPPORT) LIBS+= -lssl -lcrypto .endif -CPPFLAGS= @CPPFLAGS@ -I. -I$(srcdir) -I../lib OBJS= main.o perform.o pl.o util.o build.o .else LIBS= -linstall @LIBS@ -CPPFLAGS= @CPPFLAGS@ -I. -I$(srcdir) -I../lib -DBOOTSTRAP +CPPFLAGS+= -DBOOTSTRAP OBJS= main.o perform.o pl.o util.o .endif diff --git a/pkgtools/pkg_install/files/info/Makefile.in b/pkgtools/pkg_install/files/info/Makefile.in index 7c2141bd0a3..7187ce8d2b2 100644 --- a/pkgtools/pkg_install/files/info/Makefile.in +++ b/pkgtools/pkg_install/files/info/Makefile.in @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.in,v 1.30 2015/09/07 09:06:05 jperkin Exp $ +# $NetBSD: Makefile.in,v 1.31 2015/12/27 12:18:20 joerg Exp $ srcdir= @srcdir@ @@ -16,19 +16,20 @@ SSL_SUPPORT= @ssl_support@ CC= @CC@ CCLD= $(CC) +CPPFLAGS= @CPPFLAGS@ -I. -I$(srcdir) -I../lib +DEFS= @DEFS@ +CFLAGS= @CFLAGS@ +LDFLAGS= @LDFLAGS@ -L../lib + .if empty(BOOTSTRAP) LIBS= -linstall -lnetpgpverify -larchive -lbz2 -lz -lfetch @LIBS@ .if !empty(SSL_SUPPORT) LIBS+= -lssl -lcrypto .endif -CPPFLAGS= @CPPFLAGS@ -I. -I$(srcdir) -I../lib .else LIBS= -linstall @LIBS@ -CPPFLAGS= @CPPFLAGS@ -I. -I$(srcdir) -I../lib -DBOOTSTRAP +CPPFLAGS+= -DBOOTSTRAP .endif -DEFS= @DEFS@ -CFLAGS= @CFLAGS@ -LDFLAGS= @LDFLAGS@ -L../lib INSTALL= @INSTALL@ |