Skip to content

Commit

Permalink
examples: fix make clean when using pkg-config
Browse files Browse the repository at this point in the history 
[ upstream commit 7e9562a ]

The "make clean" command had a number of issues:
- the "--ignore-fail-on-non-empty" flag is not present on BSD
- the call to remove the build folder would fail if there was no build
  folder present.

These are fixed by only removing the build folder if it exists, and by
using -p flag to rmdir in place of --ignore-fail-on-non-empty

Fixes: 22119c4 ("examples: use pkg-config in makefiles")

Signed-off-by: Bruce Richardson <bruce.richardson@intel.com>
Acked-by: Luca Boccassi <bluca@debian.org>
  • Loading branch information
@bruce-richardson @kevintraynor
bruce-richardson authored and kevintraynor committed Jun 21, 2019
1 parent 4e00730 commit 160ed87
Show file tree
Hide file tree
Showing 40 changed files with 40 additions and 40 deletions.
2 changes: 1 addition & 1 deletion examples/bbdev_app/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ build:
.PHONY: clean
clean:
rm -f build/$(APP) build/$(APP)-static build/$(APP)-shared
rmdir --ignore-fail-on-non-empty build
test -d build && rmdir -p build || true

else

Expand Down
2 changes: 1 addition & 1 deletion examples/bond/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ build:
.PHONY: clean
clean:
rm -f build/$(APP) build/$(APP)-static build/$(APP)-shared
rmdir --ignore-fail-on-non-empty build
test -d build && rmdir -p build || true

else

Expand Down
2 changes: 1 addition & 1 deletion examples/cmdline/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ build:
.PHONY: clean
clean:
rm -f build/$(APP) build/$(APP)-static build/$(APP)-shared
rmdir --ignore-fail-on-non-empty build
test -d build && rmdir -p build || true

else

Expand Down
2 changes: 1 addition & 1 deletion examples/distributor/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ build:
.PHONY: clean
clean:
rm -f build/$(APP) build/$(APP)-static build/$(APP)-shared
rmdir --ignore-fail-on-non-empty build
test -d build && rmdir -p build || true

else

Expand Down
2 changes: 1 addition & 1 deletion examples/eventdev_pipeline/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ build:
.PHONY: clean
clean:
rm -f build/$(APP) build/$(APP)-static build/$(APP)-shared
rmdir --ignore-fail-on-non-empty build
test -d build && rmdir -p build || true

else

Expand Down
2 changes: 1 addition & 1 deletion examples/exception_path/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ build:
.PHONY: clean
clean:
rm -f build/$(APP) build/$(APP)-static build/$(APP)-shared
rmdir --ignore-fail-on-non-empty build
test -d build && rmdir -p build || true

else

Expand Down
2 changes: 1 addition & 1 deletion examples/fips_validation/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ build:
.PHONY: clean
clean:
rm -f build/$(APP) build/$(APP)-static build/$(APP)-shared
rmdir --ignore-fail-on-non-empty build
test -d build && rmdir -p build || true

else

Expand Down
2 changes: 1 addition & 1 deletion examples/flow_classify/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ build:
.PHONY: clean
clean:
rm -f build/$(APP) build/$(APP)-static build/$(APP)-shared
rmdir --ignore-fail-on-non-empty build
test -d build && rmdir -p build || true

else

Expand Down
2 changes: 1 addition & 1 deletion examples/flow_filtering/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ build:
.PHONY: clean
clean:
rm -f build/$(APP) build/$(APP)-static build/$(APP)-shared
rmdir --ignore-fail-on-non-empty build
test -d build && rmdir -p build || true

else

Expand Down
2 changes: 1 addition & 1 deletion examples/helloworld/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ build:
.PHONY: clean
clean:
rm -f build/$(APP) build/$(APP)-static build/$(APP)-shared
rmdir --ignore-fail-on-non-empty build
test -d build && rmdir -p build || true

else

Expand Down
2 changes: 1 addition & 1 deletion examples/ip_fragmentation/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ build:
.PHONY: clean
clean:
rm -f build/$(APP) build/$(APP)-static build/$(APP)-shared
rmdir --ignore-fail-on-non-empty build
test -d build && rmdir -p build || true

else

Expand Down
2 changes: 1 addition & 1 deletion examples/ip_pipeline/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ build:
.PHONY: clean
clean:
rm -f build/$(APP)* build/*.o
rmdir --ignore-fail-on-non-empty build
test -d build && rmdir -p build || true

else

Expand Down
2 changes: 1 addition & 1 deletion examples/ip_reassembly/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ build:
.PHONY: clean
clean:
rm -f build/$(APP) build/$(APP)-static build/$(APP)-shared
rmdir --ignore-fail-on-non-empty build
test -d build && rmdir -p build || true

else

Expand Down
2 changes: 1 addition & 1 deletion examples/ipsec-secgw/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ build:
.PHONY: clean
clean:
rm -f build/$(APP) build/$(APP)-static build/$(APP)-shared
rmdir --ignore-fail-on-non-empty build
test -d build && rmdir -p build || true

else

Expand Down
2 changes: 1 addition & 1 deletion examples/ipv4_multicast/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ build:
.PHONY: clean
clean:
rm -f build/$(APP) build/$(APP)-static build/$(APP)-shared
rmdir --ignore-fail-on-non-empty build
test -d build && rmdir -p build || true

else # Build using legacy build system

Expand Down
2 changes: 1 addition & 1 deletion examples/kni/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ build:
.PHONY: clean
clean:
rm -f build/$(APP) build/$(APP)-static build/$(APP)-shared
rmdir --ignore-fail-on-non-empty build
test -d build && rmdir -p build || true

else # Build using legacy build system

Expand Down
2 changes: 1 addition & 1 deletion examples/l2fwd-cat/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ build:
.PHONY: clean
clean:
rm -f build/$(APP) build/$(APP)-static build/$(APP)-shared
rmdir --ignore-fail-on-non-empty build
test -d build && rmdir -p build || true

else # Build using legacy build system

Expand Down
2 changes: 1 addition & 1 deletion examples/l2fwd-crypto/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ build:
.PHONY: clean
clean:
rm -f build/$(APP) build/$(APP)-static build/$(APP)-shared
rmdir --ignore-fail-on-non-empty build
test -d build && rmdir -p build || true

else # Build using legacy build system

Expand Down
2 changes: 1 addition & 1 deletion examples/l2fwd-jobstats/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ build:
.PHONY: clean
clean:
rm -f build/$(APP) build/$(APP)-static build/$(APP)-shared
rmdir --ignore-fail-on-non-empty build
test -d build && rmdir -p build || true

else # Build using legacy build system

Expand Down
2 changes: 1 addition & 1 deletion examples/l2fwd-keepalive/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ build:
.PHONY: clean
clean:
rm -f build/$(APP) build/$(APP)-static build/$(APP)-shared
rmdir --ignore-fail-on-non-empty build
test -d build && rmdir -p build || true

else # Build using legacy build system

Expand Down
2 changes: 1 addition & 1 deletion examples/l2fwd/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ build:
.PHONY: clean
clean:
rm -f build/$(APP) build/$(APP)-static build/$(APP)-shared
rmdir --ignore-fail-on-non-empty build
test -d build && rmdir -p build || true

else # Build using legacy build system

Expand Down
2 changes: 1 addition & 1 deletion examples/l3fwd-acl/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ build:
.PHONY: clean
clean:
rm -f build/$(APP) build/$(APP)-static build/$(APP)-shared
rmdir --ignore-fail-on-non-empty build
test -d build && rmdir -p build || true

else # Build using legacy build system

Expand Down
2 changes: 1 addition & 1 deletion examples/l3fwd-power/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ build:
.PHONY: clean
clean:
rm -f build/$(APP) build/$(APP)-static build/$(APP)-shared
rmdir --ignore-fail-on-non-empty build
test -d build && rmdir -p build || true

else # Build using legacy build system

Expand Down
2 changes: 1 addition & 1 deletion examples/l3fwd-vf/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ build:
.PHONY: clean
clean:
rm -f build/$(APP) build/$(APP)-static build/$(APP)-shared
rmdir --ignore-fail-on-non-empty build
test -d build && rmdir -p build || true

else # Build using legacy build system

Expand Down
2 changes: 1 addition & 1 deletion examples/l3fwd/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ build:
.PHONY: clean
clean:
rm -f build/$(APP) build/$(APP)-static build/$(APP)-shared
rmdir --ignore-fail-on-non-empty build
test -d build && rmdir -p build || true

else # Build using legacy build system

Expand Down
2 changes: 1 addition & 1 deletion examples/link_status_interrupt/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ build:
.PHONY: clean
clean:
rm -f build/$(APP) build/$(APP)-static build/$(APP)-shared
rmdir --ignore-fail-on-non-empty build
test -d build && rmdir -p build || true

else # Build using legacy build system

Expand Down
2 changes: 1 addition & 1 deletion examples/load_balancer/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ build:
.PHONY: clean
clean:
rm -f build/$(APP) build/$(APP)-static build/$(APP)-shared
rmdir --ignore-fail-on-non-empty build
test -d build && rmdir -p build || true

else # Build using legacy build system

Expand Down
2 changes: 1 addition & 1 deletion examples/packet_ordering/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ build:
.PHONY: clean
clean:
rm -f build/$(APP) build/$(APP)-static build/$(APP)-shared
rmdir --ignore-fail-on-non-empty build
test -d build && rmdir -p build || true

else # Build using legacy build system

Expand Down
2 changes: 1 addition & 1 deletion examples/ptpclient/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ build:
.PHONY: clean
clean:
rm -f build/$(APP) build/$(APP)-static build/$(APP)-shared
rmdir --ignore-fail-on-non-empty build
test -d build && rmdir -p build || true

else # Build using legacy build system

Expand Down
2 changes: 1 addition & 1 deletion examples/qos_meter/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ build:
.PHONY: clean
clean:
rm -f build/$(APP) build/$(APP)-static build/$(APP)-shared
rmdir --ignore-fail-on-non-empty build
test -d build && rmdir -p build || true

else # Build using legacy build system

Expand Down
2 changes: 1 addition & 1 deletion examples/qos_sched/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ build:
.PHONY: clean
clean:
rm -f build/$(APP) build/$(APP)-static build/$(APP)-shared
rmdir --ignore-fail-on-non-empty build
test -d build && rmdir -p build || true

else # Build using legacy build system

Expand Down
2 changes: 1 addition & 1 deletion examples/rxtx_callbacks/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ build:
.PHONY: clean
clean:
rm -f build/$(APP) build/$(APP)-static build/$(APP)-shared
rmdir --ignore-fail-on-non-empty build
test -d build && rmdir -p build || true

else # Build using legacy build system

Expand Down
2 changes: 1 addition & 1 deletion examples/service_cores/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ build:
.PHONY: clean
clean:
rm -f build/$(APP) build/$(APP)-static build/$(APP)-shared
rmdir --ignore-fail-on-non-empty build
test -d build && rmdir -p build || true

else

Expand Down
2 changes: 1 addition & 1 deletion examples/skeleton/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ build:
.PHONY: clean
clean:
rm -f build/$(APP) build/$(APP)-static build/$(APP)-shared
rmdir --ignore-fail-on-non-empty build
test -d build && rmdir -p build || true

else # Build using legacy build system

Expand Down
2 changes: 1 addition & 1 deletion examples/tep_termination/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ build:
.PHONY: clean
clean:
rm -f build/$(APP) build/$(APP)-static build/$(APP)-shared
rmdir --ignore-fail-on-non-empty build
test -d build && rmdir -p build || true

else # Build using legacy build system

Expand Down
2 changes: 1 addition & 1 deletion examples/timer/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ build:
.PHONY: clean
clean:
rm -f build/$(APP) build/$(APP)-static build/$(APP)-shared
rmdir --ignore-fail-on-non-empty build
test -d build && rmdir -p build || true

else # Build using legacy build system

Expand Down
2 changes: 1 addition & 1 deletion examples/vhost/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ build:
.PHONY: clean
clean:
rm -f build/$(APP) build/$(APP)-static build/$(APP)-shared
rmdir --ignore-fail-on-non-empty build
test -d build && rmdir -p build || true

else # Build using legacy build system

Expand Down
2 changes: 1 addition & 1 deletion examples/vhost_scsi/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ build:
.PHONY: clean
clean:
rm -f build/$(APP) build/$(APP)-static build/$(APP)-shared
rmdir --ignore-fail-on-non-empty build
test -d build && rmdir -p build || true

else # Build using legacy build system

Expand Down
2 changes: 1 addition & 1 deletion examples/vmdq/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ build:
.PHONY: clean
clean:
rm -f build/$(APP) build/$(APP)-static build/$(APP)-shared
rmdir --ignore-fail-on-non-empty build
test -d build && rmdir -p build || true

else # Build using legacy build system

Expand Down
2 changes: 1 addition & 1 deletion examples/vmdq_dcb/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ build:
.PHONY: clean
clean:
rm -f build/$(APP) build/$(APP)-static build/$(APP)-shared
rmdir --ignore-fail-on-non-empty build
test -d build && rmdir -p build || true

else # Build using legacy build system

Expand Down

0 comments on commit 160ed87

Please sign in to comment.