From 0744c6be08cb4f7cdd46bbe13f5877b23257745f Mon Sep 17 00:00:00 2001 From: Dan Williams Date: Wed, 24 Jul 2013 14:05:46 -0500 Subject: [PATCH] build: simplify rdisc tests makefile subdirs src/rdisc doesn't need a makefile just to point to the tests, we can do that more easily from src/Makefile.am like we do for all the other tests subdirs. --- configure.ac | 1 - src/Makefile.am | 1 + src/rdisc/Makefile.am | 1 - 3 files changed, 1 insertion(+), 2 deletions(-) delete mode 100644 src/rdisc/Makefile.am diff --git a/configure.ac b/configure.ac index ee3925e465..bfabd9a197 100644 --- a/configure.ac +++ b/configure.ac @@ -689,7 +689,6 @@ src/settings/plugins/example/Makefile src/settings/tests/Makefile src/platform/Makefile src/platform/tests/Makefile -src/rdisc/Makefile src/rdisc/tests/Makefile src/devices/wimax/Makefile libnm-util/libnm-util.pc diff --git a/src/Makefile.am b/src/Makefile.am index 881447f3e8..2ddbd86359 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -19,6 +19,7 @@ SUBDIRS += \ platform \ settings/tests \ supplicant-manager/tests \ + rdisc/tests \ tests endif diff --git a/src/rdisc/Makefile.am b/src/rdisc/Makefile.am deleted file mode 100644 index 3c6155b9c6..0000000000 --- a/src/rdisc/Makefile.am +++ /dev/null @@ -1 +0,0 @@ -SUBDIRS = tests