b37f199 Properly handle dependency to trigger rebuilds — HardenedBSD-pkg

rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9

HardenedBSD Package Manager

Properly handle dependency to trigger rebuilds

Baptiste Daroussin committed 6 years ago

commit b37f199dee5181e078ea04d72fdd1dc559458af8
parent fa73e9e

5 files changed +10 -6

modified mk/common.mk

@@ -1,15 +1,20 @@

 CFLAGS?=	-O2 -pipe
 OBJS=	${SRCS:.c=.o}
 SHOBJS?=	${SRCS:.c=.pico}
 DEPFILES=	${OBJS:.o=.Po} ${SHOBJS:.pico=.Ppico}
 CFLAGS+=	$(CPPFLAGS)
 -include $(DEPFILES)
 .SUFFIXES: .pico .in
 .c.o:
 	$(CC) -Wall -Wextra -std=gnu99 -D_GNU_SOURCE=1 -o $@ -c $(CFLAGS) $(LOCAL_CFLAGS) $<
 	$(CC) -Wall -Wextra -std=gnu99 -D_GNU_SOURCE=1 -MT $@ -MD -MP -MF $*.Tpo -o $@ -c $(CFLAGS) $(LOCAL_CFLAGS) $<
 	mv $*.Tpo $*.Po
 .c.pico:
 	$(CC) -Wall -Wextra -std=gnu99 -D_GNU_SOURCE=1 -o $@ -c $(CFLAGS) $(LOCAL_CFLAGS) $(SHOBJ_CFLAGS) $<
 	$(CC) -Wall -Wextra -std=gnu99 -D_GNU_SOURCE=1 -MT $@ -MD -MP -MF $*.Tpico -o $@ -c $(CFLAGS) $(LOCAL_CFLAGS) $(SHOBJ_CFLAGS) $<
 	mv $*.Tpico $*.Ppico
 .in:
 	sed -e 's|@prefix@|$(PREFIX)|g; s|@abs_top_srcdir@|$(top_srcdir)|g' \

modified mk/lib.mk

@@ -13,6 +13,6 @@ lib$(LIB).a: $(OBJS)

 	$(RANLIB) $@
 clean:
 	rm -f lib$(LIB).a lib$(LIB)$(SH_SOEXT) lib$(LIB)$(LIBSOEXT) $(OBJS) $(SHOBJS)
 	rm -f lib$(LIB).a lib$(LIB)$(SH_SOEXT) lib$(LIB)$(LIBSOEXT) $(OBJS) $(SHOBJS) $(DEPFILES)
 install:

modified mk/prog.mk

@@ -8,6 +8,6 @@ $(PROGNAME): $(OBJS)

 	$(CC) -o $@ $(OBJS) $(LDFLAGS) $(LOCAL_LDFLAGS)
 clean:
 	rm -f $(PROGNAME) $(OBJS)
 	rm -f $(PROGNAME) $(OBJS) $(DEPFILES)
 install:

modified mk/static-lib.mk

@@ -11,6 +11,6 @@ lib$(LIB)_pic.a: $(SHOBJS)

 	$(RANLIB) $@
 clean:
 	rm -f lib$(LIB).a lib$(LIB)_pic.a $(OBJS) $(SHOBJS)
 	rm -f lib$(LIB).a lib$(LIB)_pic.a $(OBJS) $(SHOBJS) $(DEPFILES)
 install:

modified scripts/Makefile.autosetup

@@ -1,5 +1,4 @@

 include @builddir@/mk/defs.mk
 include $(MK)/common.mk
 pdailydir=		$(sysconfdir)/periodic/daily
 psecuritydir=		$(sysconfdir)/periodic/security