From 277fbb92d5e4cd0938c67f77b08d9ba4ac9d54a6 Mon Sep 17 00:00:00 2001 From: Bryan Drewery Date: Wed, 25 Nov 2015 20:38:07 +0000 Subject: [PATCH] Remove redundant DPSRCS which were already in SRCS. DPSRCS already contains all of SRCS. MFC after: 1 week Sponsored by: EMC / Isilon Storage Division --- lib/clang/clang.build.mk | 1 - lib/libarchive/tests/Makefile | 4 +--- sbin/ipf/ipf/Makefile | 2 -- sbin/ipf/ipftest/Makefile | 1 - sbin/ipf/ipmon/Makefile | 2 -- sbin/ipf/ipnat/Makefile | 2 -- sbin/ipf/ippool/Makefile | 2 -- usr.bin/cpio/tests/Makefile | 3 --- usr.bin/tar/tests/Makefile | 2 -- 9 files changed, 1 insertion(+), 18 deletions(-) diff --git a/lib/clang/clang.build.mk b/lib/clang/clang.build.mk index 0c564a5fadf..735e5b995ec 100644 --- a/lib/clang/clang.build.mk +++ b/lib/clang/clang.build.mk @@ -256,7 +256,6 @@ Checkers.inc.h: ${CLANG_SRCS}/lib/StaticAnalyzer/Checkers/Checkers.td .endif SRCS+= ${TGHDRS:C/$/.inc.h/} -DPSRCS+= ${TGHDRS:C/$/.inc.h/} CLEANFILES+= ${TGHDRS:C/$/.inc.h/} ${TGHDRS:C/$/.inc.d/} # if we are not doing explicit 'make depend', there is diff --git a/lib/libarchive/tests/Makefile b/lib/libarchive/tests/Makefile index bf225b6365f..a7de76b3de7 100644 --- a/lib/libarchive/tests/Makefile +++ b/lib/libarchive/tests/Makefile @@ -244,9 +244,7 @@ BROKEN_TESTS+= test_fuzz_rar SRCS.libarchive_test= \ ${TESTS_SRCS} \ main.c \ - read_open_memory.c - -DPSRCS.libarchive_test= \ + read_open_memory.c \ list.h LIBADD.libarchive_test= archive diff --git a/sbin/ipf/ipf/Makefile b/sbin/ipf/ipf/Makefile index 3ffd2b27248..2ff340f68c0 100644 --- a/sbin/ipf/ipf/Makefile +++ b/sbin/ipf/ipf/Makefile @@ -7,8 +7,6 @@ MLINKS= ipf.5 ipf.conf.5 ipf.5 ipf6.conf.5 CFLAGS+= -I. -DIPFILTER_BPF -DHAS_SYS_MD5_H GENHDRS= ipf_l.h ipf_y.h -DPSRCS+= ${GENHDRS} - CLEANFILES+= ${GENHDRS} ipf_y.c ipf_l.c ipf_y.c: ipf_y.y diff --git a/sbin/ipf/ipftest/Makefile b/sbin/ipf/ipftest/Makefile index 7d8260a072a..a74599f3cd1 100644 --- a/sbin/ipf/ipftest/Makefile +++ b/sbin/ipf/ipftest/Makefile @@ -22,7 +22,6 @@ CFLAGS+= -DIPFILTER_LOG -DIPFILTER_COMPILED -DIPFILTER_LOOKUP \ .PATH: ${.CURDIR}/../../../sys/contrib/ipfilter/netinet GENHDRS= ipnat_l.h ipnat_y.h ippool_l.h ippool_y.h ipf_l.h ipf_y.h -DPSRCS+= ${GENHDRS} CLEANFILES+= ${GENHDRS} CLEANFILES+= ipf_y.c ipf_l.c diff --git a/sbin/ipf/ipmon/Makefile b/sbin/ipf/ipmon/Makefile index 3639f8733c1..031f929067b 100644 --- a/sbin/ipf/ipmon/Makefile +++ b/sbin/ipf/ipmon/Makefile @@ -7,8 +7,6 @@ MAN= ipmon.8 CFLAGS+= -DLOGFAC=LOG_LOCAL0 -I. GENHDRS+= ipmon_l.h ipmon_y.h -DPSRCS+= ${GENHDRS} - CLEANFILES+= ${GENHDRS} ipmon_y.c ipmon_l.c ipmon_y.c: ipmon_y.y diff --git a/sbin/ipf/ipnat/Makefile b/sbin/ipf/ipnat/Makefile index 1c017e182cb..74be486ec55 100644 --- a/sbin/ipf/ipnat/Makefile +++ b/sbin/ipf/ipnat/Makefile @@ -7,8 +7,6 @@ MLINKS= ipnat.5 ipnat.conf.5 CFLAGS+= -I. GENHDRS= ipnat_l.h ipnat_y.h -DPSRCS+= ${GENHDRS} - CLEANFILES+= ${GENHDRS} ipnat_y.c ipnat_l.c ipnat_y.c: ipnat_y.y diff --git a/sbin/ipf/ippool/Makefile b/sbin/ipf/ippool/Makefile index 6e3f85da847..eedebef90ba 100644 --- a/sbin/ipf/ippool/Makefile +++ b/sbin/ipf/ippool/Makefile @@ -6,8 +6,6 @@ MAN= ippool.5 ippool.8 CFLAGS+= -I. GENHDRS= ippool_l.h ippool_y.h -DPSRCS+= ${GENHDRS} - CLEANFILES+= ${GENHDRS} ippool_y.c ippool_l.c ippool_y.c: ippool_y.y diff --git a/usr.bin/cpio/tests/Makefile b/usr.bin/cpio/tests/Makefile index a1f8a5e937a..d633abd96bd 100644 --- a/usr.bin/cpio/tests/Makefile +++ b/usr.bin/cpio/tests/Makefile @@ -75,9 +75,6 @@ SRCS.bsdcpio_test= list.h \ ${TESTS_SRCS} \ main.c -DPSRCS.bsdcpio_test= \ - list.h - .PATH: ${LIBARCHIVEDIR}/test_utils SRCS.bsdcpio_test+= test_utils.c diff --git a/usr.bin/tar/tests/Makefile b/usr.bin/tar/tests/Makefile index b1cccfe48fa..02918b3b461 100644 --- a/usr.bin/tar/tests/Makefile +++ b/usr.bin/tar/tests/Makefile @@ -75,8 +75,6 @@ SRCS.bsdtar_test= \ list.h \ main.c -DPSRCS.bsdtar_test+= list.h - .PATH: ${LIBARCHIVEDIR}/test_utils SRCS.bsdtar_test+= test_utils.c -- 2.45.2