Sun Dec 27 12:18:20 2015 UTC ()
Refactor Makefiles slightly to remove redundancy between normal and
bootstrap build.


(joerg)
diff -r1.29 -r1.30 pkgsrc/pkgtools/pkg_install/files/admin/Makefile.in
diff -r1.27 -r1.28 pkgsrc/pkgtools/pkg_install/files/create/Makefile.in
diff -r1.30 -r1.31 pkgsrc/pkgtools/pkg_install/files/info/Makefile.in
cvs diff -r1.29 -r1.30 pkgsrc/pkgtools/pkg_install/files/admin/Makefile.in (expand / switch to unified diff)

--- pkgsrc/pkgtools/pkg_install/files/admin/Makefile.in 2015/09/07 09:06:05 1.29
+++ pkgsrc/pkgtools/pkg_install/files/admin/Makefile.in 2015/12/27 12:18:20 1.30
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile.in,v 1.29 2015/09/07 09:06:05 jperkin Exp $ 1# $NetBSD: Makefile.in,v 1.30 2015/12/27 12:18:20 joerg Exp $
2 2
3srcdir= @srcdir@ 3srcdir= @srcdir@
4 4
5prefix= @prefix@ 5prefix= @prefix@
6exec_prefix= @exec_prefix@ 6exec_prefix= @exec_prefix@
7sbindir= @sbindir@ 7sbindir= @sbindir@
8mandir= @mandir@ 8mandir= @mandir@
9datarootdir= @datarootdir@ 9datarootdir= @datarootdir@
10 10
11man1dir= $(mandir)/man1 11man1dir= $(mandir)/man1
12cat1dir= $(mandir)/cat1 12cat1dir= $(mandir)/cat1
13man8dir= $(mandir)/man8 13man8dir= $(mandir)/man8
14cat8dir= $(mandir)/cat8 14cat8dir= $(mandir)/cat8
@@ -17,39 +17,40 @@ BOOTSTRAP= @bootstrap@ @@ -17,39 +17,40 @@ BOOTSTRAP= @bootstrap@
17SSL_SUPPORT= @ssl_support@ 17SSL_SUPPORT= @ssl_support@
18 18
19CC= @CC@ 19CC= @CC@
20CCLD= $(CC) 20CCLD= $(CC)
21DEFS= @DEFS@ 21DEFS= @DEFS@
22CFLAGS= @CFLAGS@ 22CFLAGS= @CFLAGS@
23LDFLAGS= @LDFLAGS@ -L../lib 23LDFLAGS= @LDFLAGS@ -L../lib
24 24
25INSTALL= @INSTALL@ 25INSTALL= @INSTALL@
26 26
27PROG= pkg_admin 27PROG= pkg_admin
28SCRIPTS= audit-packages download-vulnerability-list 28SCRIPTS= audit-packages download-vulnerability-list
29 29
 30CPPFLAGS= @CPPFLAGS@ -I. -I$(srcdir) -I../lib
 31
30.if empty(BOOTSTRAP) 32.if empty(BOOTSTRAP)
31LIBS= -linstall -lnetpgpverify -larchive -lbz2 -lz -lfetch 33LIBS= -linstall -lnetpgpverify -larchive -lbz2 -lz -lfetch
32.if !empty(SSL_SUPPORT) 34.if !empty(SSL_SUPPORT)
33LIBS+= -lssl -lcrypto 35LIBS+= -lssl -lcrypto
34CFLAGS+= -DHAVE_SSL 36CPPFLAGS+= -DHAVE_SSL
35.endif 37.endif
36LIBS+= @LIBS@ 38LIBS+= @LIBS@
37OBJS= audit.o check.o main.o 39OBJS= audit.o check.o main.o
38CPPFLAGS= @CPPFLAGS@ -I. -I$(srcdir) -I../lib 
39.else 40.else
40LIBS= -linstall @LIBS@ 41LIBS= -linstall @LIBS@
41OBJS= check.o main.o 42OBJS= check.o main.o
42CPPFLAGS= @CPPFLAGS@ -I. -I$(srcdir) -I../lib -DBOOTSTRAP 43CPPFLAGS+= -DBOOTSTRAP
43.endif 44.endif
44 45
45all: $(PROG) $(SCRIPTS) 46all: $(PROG) $(SCRIPTS)
46 47
47.c.o: 48.c.o:
48 $(CC) $(DEFS) $(CPPFLAGS) $(CFLAGS) -c $< 49 $(CC) $(DEFS) $(CPPFLAGS) $(CFLAGS) -c $<
49 50
50$(PROG): $(OBJS) 51$(PROG): $(OBJS)
51 $(CCLD) $(LDFLAGS) -o $@ $(OBJS) $(LIBS) 52 $(CCLD) $(LDFLAGS) -o $@ $(OBJS) $(LIBS)
52 53
53clean: 54clean:
54 rm -f $(OBJS) $(PROG) 55 rm -f $(OBJS) $(PROG)
55 56
cvs diff -r1.27 -r1.28 pkgsrc/pkgtools/pkg_install/files/create/Makefile.in (expand / switch to unified diff)

--- pkgsrc/pkgtools/pkg_install/files/create/Makefile.in 2015/09/07 09:06:05 1.27
+++ pkgsrc/pkgtools/pkg_install/files/create/Makefile.in 2015/12/27 12:18:20 1.28
@@ -1,50 +1,50 @@ @@ -1,50 +1,50 @@
1# $NetBSD: Makefile.in,v 1.27 2015/09/07 09:06:05 jperkin Exp $ 1# $NetBSD: Makefile.in,v 1.28 2015/12/27 12:18:20 joerg Exp $
2 2
3srcdir= @srcdir@ 3srcdir= @srcdir@
4 4
5prefix= @prefix@ 5prefix= @prefix@
6exec_prefix= @exec_prefix@ 6exec_prefix= @exec_prefix@
7sbindir= @sbindir@ 7sbindir= @sbindir@
8mandir= @mandir@ 8mandir= @mandir@
9datarootdir= @datarootdir@ 9datarootdir= @datarootdir@
10 10
11man1dir= $(mandir)/man1 11man1dir= $(mandir)/man1
12cat1dir= $(mandir)/cat1 12cat1dir= $(mandir)/cat1
13 13
14BOOTSTRAP= @bootstrap@ 14BOOTSTRAP= @bootstrap@
15 15
16CC= @CC@ 16CC= @CC@
17CCLD= $(CC) 17CCLD= $(CC)
18DEFS= @DEFS@ 18DEFS= @DEFS@
19CFLAGS= @CFLAGS@ 19CFLAGS= @CFLAGS@
20LDFLAGS= @LDFLAGS@ -L../lib 20LDFLAGS= @LDFLAGS@ -L../lib
21 21
22INSTALL= @INSTALL@ 22INSTALL= @INSTALL@
23 23
24PROG= pkg_create 24PROG= pkg_create
25 25
26SSL_SUPPORT= @ssl_support@ 26SSL_SUPPORT= @ssl_support@
 27CPPFLAGS= @CPPFLAGS@ -I. -I$(srcdir) -I../lib
27 28
28.if empty(BOOTSTRAP) 29.if empty(BOOTSTRAP)
29LIBS= -linstall -lnetpgpverify -larchive -lbz2 -lz -lfetch @LIBS@ 30LIBS= -linstall -lnetpgpverify -larchive -lbz2 -lz -lfetch @LIBS@
30.if !empty(SSL_SUPPORT) 31.if !empty(SSL_SUPPORT)
31LIBS+= -lssl -lcrypto 32LIBS+= -lssl -lcrypto
32.endif 33.endif
33CPPFLAGS= @CPPFLAGS@ -I. -I$(srcdir) -I../lib 
34OBJS= main.o perform.o pl.o util.o build.o 34OBJS= main.o perform.o pl.o util.o build.o
35.else 35.else
36LIBS= -linstall @LIBS@ 36LIBS= -linstall @LIBS@
37CPPFLAGS= @CPPFLAGS@ -I. -I$(srcdir) -I../lib -DBOOTSTRAP 37CPPFLAGS+= -DBOOTSTRAP
38OBJS= main.o perform.o pl.o util.o 38OBJS= main.o perform.o pl.o util.o
39.endif 39.endif
40 40
41all: $(PROG) 41all: $(PROG)
42 42
43.c.o: 43.c.o:
44 $(CC) $(DEFS) $(CPPFLAGS) $(CFLAGS) -c $< 44 $(CC) $(DEFS) $(CPPFLAGS) $(CFLAGS) -c $<
45 45
46$(PROG): $(OBJS) 46$(PROG): $(OBJS)
47 $(CCLD) $(LDFLAGS) -o $@ $(OBJS) $(LIBS) 47 $(CCLD) $(LDFLAGS) -o $@ $(OBJS) $(LIBS)
48 48
49clean: 49clean:
50 rm -f $(OBJS) $(PROG) 50 rm -f $(OBJS) $(PROG)
cvs diff -r1.30 -r1.31 pkgsrc/pkgtools/pkg_install/files/info/Makefile.in (expand / switch to unified diff)

--- pkgsrc/pkgtools/pkg_install/files/info/Makefile.in 2015/09/07 09:06:05 1.30
+++ pkgsrc/pkgtools/pkg_install/files/info/Makefile.in 2015/12/27 12:18:20 1.31
@@ -1,44 +1,45 @@ @@ -1,44 +1,45 @@
1# $NetBSD: Makefile.in,v 1.30 2015/09/07 09:06:05 jperkin Exp $ 1# $NetBSD: Makefile.in,v 1.31 2015/12/27 12:18:20 joerg Exp $
2 2
3srcdir= @srcdir@ 3srcdir= @srcdir@
4 4
5prefix= @prefix@ 5prefix= @prefix@
6exec_prefix= @exec_prefix@ 6exec_prefix= @exec_prefix@
7sbindir= @sbindir@ 7sbindir= @sbindir@
8mandir= @mandir@ 8mandir= @mandir@
9datarootdir= @datarootdir@ 9datarootdir= @datarootdir@
10 10
11man1dir= $(mandir)/man1 11man1dir= $(mandir)/man1
12cat1dir= $(mandir)/cat1 12cat1dir= $(mandir)/cat1
13 13
14BOOTSTRAP= @bootstrap@ 14BOOTSTRAP= @bootstrap@
15SSL_SUPPORT= @ssl_support@ 15SSL_SUPPORT= @ssl_support@
16 16
17CC= @CC@ 17CC= @CC@
18CCLD= $(CC) 18CCLD= $(CC)
 19CPPFLAGS= @CPPFLAGS@ -I. -I$(srcdir) -I../lib
 20DEFS= @DEFS@
 21CFLAGS= @CFLAGS@
 22LDFLAGS= @LDFLAGS@ -L../lib
 23
19.if empty(BOOTSTRAP) 24.if empty(BOOTSTRAP)
20LIBS= -linstall -lnetpgpverify -larchive -lbz2 -lz -lfetch @LIBS@ 25LIBS= -linstall -lnetpgpverify -larchive -lbz2 -lz -lfetch @LIBS@
21.if !empty(SSL_SUPPORT) 26.if !empty(SSL_SUPPORT)
22LIBS+= -lssl -lcrypto 27LIBS+= -lssl -lcrypto
23.endif 28.endif
24CPPFLAGS= @CPPFLAGS@ -I. -I$(srcdir) -I../lib 
25.else 29.else
26LIBS= -linstall @LIBS@ 30LIBS= -linstall @LIBS@
27CPPFLAGS= @CPPFLAGS@ -I. -I$(srcdir) -I../lib -DBOOTSTRAP 31CPPFLAGS+= -DBOOTSTRAP
28.endif 32.endif
29DEFS= @DEFS@ 
30CFLAGS= @CFLAGS@ 
31LDFLAGS= @LDFLAGS@ -L../lib 
32 33
33INSTALL= @INSTALL@ 34INSTALL= @INSTALL@
34 35
35PROG= pkg_info 36PROG= pkg_info
36 37
37OBJS= main.o perform.o show.o 38OBJS= main.o perform.o show.o
38 39
39all: $(PROG) 40all: $(PROG)
40 41
41.c.o: 42.c.o:
42 $(CC) $(DEFS) $(CPPFLAGS) $(CFLAGS) -c $< 43 $(CC) $(DEFS) $(CPPFLAGS) $(CFLAGS) -c $<
43 44
44$(PROG): $(OBJS) 45$(PROG): $(OBJS)