*: Remove cumulus Directory

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>

diff --git a/Makefile.am b/Makefile.am
index 89e7ea890e2be5b979a9d384993757f1bd78e628..f287038fdfb9dfb491bd7c918decb949db3db7a9 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -4,11 +4,11 @@ SUBDIRS = lib qpb fpm @ZEBRA@ @LIBRFP@ @RFPTEST@ \
         @BGPD@ @RIPD@ @RIPNGD@ @OSPFD@ @OSPF6D@ @LDPD@ \
          @ISISD@ @PIMD@ @NHRPD@ \
         @WATCHFRR@ @VTYSH@ @OSPFCLIENT@ @DOC@ m4 @pkgsrcdir@ \
-         redhat @SOLARIS@ tests tools cumulus snapcraft
+         redhat @SOLARIS@ tests tools snapcraft
 
 DIST_SUBDIRS = lib qpb fpm zebra bgpd ripd ripngd ospfd ospf6d ldpd \
          isisd watchfrr vtysh ospfclient doc m4 pkgsrc redhat tests \
-         solaris pimd nhrpd @LIBRFP@ @RFPTEST@ tools cumulus snapcraft
+         solaris pimd nhrpd @LIBRFP@ @RFPTEST@ tools snapcraft
 
 EXTRA_DIST = aclocal.m4 SERVICES REPORTING-BUGS \
        update-autotools \

diff --git a/configure.ac b/configure.ac
index d376bf1464286f05206d7d1a87f353c4b366d842..3d3c258becd1c5185e096b3c2a50df03084241d9 100755 (executable)
--- a/configure.ac
+++ b/configure.ac
@@ -1831,7 +1831,6 @@ AC_CONFIG_FILES([Makefile lib/Makefile qpb/Makefile zebra/Makefile ripd/Makefile
          nhrpd/Makefile
          redhat/Makefile
          tools/Makefile
-         cumulus/Makefile
          pkgsrc/Makefile
          fpm/Makefile
          redhat/frr.spec 

diff --git a/cumulus/.gitignore b/cumulus/.gitignore
deleted file mode 100644 (file)
index 2a198f5..0000000
--- a/cumulus/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*.o
-ssd

diff --git a/cumulus/Makefile.am b/cumulus/Makefile.am
deleted file mode 100644 (file)
index 2601c7d..0000000
--- a/cumulus/Makefile.am
+++ /dev/null
@@ -1,2 +0,0 @@
-
-EXTRA_DIST = etc/frr/debian.conf etc/frr/daemons etc/default/frr