10 files changed, 95 insertions, 26 deletions
diff --git a/gr-fcd/lib/Makefile.am b/gr-fcd/lib/Makefile.am
index 23da5ba49..89f3446f8 100644
--- a/gr-fcd/lib/Makefile.am
+++ b/gr-fcd/lib/Makefile.am
@@ -1,5 +1,5 @@
 #
-# Copyright 2004,2005,2006,2008,2009,2010,2012 Free Software Foundation, Inc.
+# Copyright 2012 Free Software Foundation, Inc.
 # 
 # This file is part of GNU Radio
 # 
@@ -21,39 +21,24 @@
 
 include $(top_srcdir)/Makefile.common
 
+SUBDIRS = hid fcd
+
 AM_CPPFLAGS = \
 	$(STD_DEFINES_AND_INCLUDES) \
 	$(WITH_INCLUDES) \
-	$(USB_CPPFLAGS) \
-	-I$(top_srcdir)/gr-audio/include
-
-lib_LTLIBRARIES = \
-	libgnuradio-fcd.la
+	-I$(top_srcdir)/gr-audio/include \
+	-I$(top_srcdir)/gr-fcd/lib/fcd
 
-libgnuradio_fcd_la_SOURCES = \
-	fcd_source_c.cc \
-	fcd.c
+lib_LTLIBRARIES = libgnuradio-fcd.la
 
-if FCD_MACOSX
-    libgnuradio_fcd_la_SOURCES += hidmac.c
-else if FCD_WINDOWS
-    libgnuradio_fcd_la_SOURCES += hidwin.c
-else
-    libgnuradio_fcd_la_SOURCES += hid-libusb.c
-endif
-
-noinst_HEADERS = \
-	fcd.h \
-	fcdhidcmd.h \
-	hidapi.h
+libgnuradio_fcd_la_SOURCES = fcd_source_c.cc
 
 libgnuradio_fcd_la_LIBADD = \
 	$(GNURADIO_CORE_LA) \
-	$(top_builddir)/gr-audio/lib/libgnuradio-audio.la \
-	$(GNURADIO_AUDIO_LA) \
-	$(USB_LIBS)
+	$(top_builddir)/gr-fcd/lib/fcd/libfcd.la \
+	$(top_builddir)/gr-audio/lib/libgnuradio-audio.la
+
 
 libgnuradio_fcd_la_LDFLAGS = $(NO_UNDEFINED) $(LTVERSIONFLAGS)
 
-grinclude_HEADERS = \
-	fcd_source_c.h
+grinclude_HEADERS = fcd_source_c.h
diff --git a/gr-fcd/lib/fcd/Makefile.am b/gr-fcd/lib/fcd/Makefile.am
new file mode 100644
index 000000000..0eff4785b
--- /dev/null
+++ b/gr-fcd/lib/fcd/Makefile.am
@@ -0,0 +1,40 @@
+#
+# Copyright 2012 Free Software Foundation, Inc.
+# 
+# This file is part of GNU Radio
+# 
+# GNU Radio is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3, or (at your option)
+# any later version.
+# 
+# GNU Radio is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+# 
+# You should have received a copy of the GNU General Public License
+# along with GNU Radio; see the file COPYING.  If not, write to
+# the Free Software Foundation, Inc., 51 Franklin Street,
+# Boston, MA 02110-1301, USA.
+# 
+
+include $(top_srcdir)/Makefile.common
+
+AM_CPPFLAGS = \
+	$(STD_DEFINES_AND_INCLUDES) \
+	$(WITH_INCLUDES) \
+	$(USB_CPPFLAGS) \
+	-I$(top_srcdir)/gr-fcd/lib/hid
+
+noinst_LTLIBRARIES = libfcd.la
+
+libfcd_la_SOURCES = fcd.c
+
+noinst_HEADERS = \
+	fcd.h \
+	fcdhidcmd.h
+
+libfcd_la_LIBADD = \
+	$(top_builddir)/gr-fcd/lib/hid/libhid.la
+
diff --git a/gr-fcd/lib/fcd.c b/gr-fcd/lib/fcd/fcd.c
index 7e5e82998..7e5e82998 100644
--- a/gr-fcd/lib/fcd.c
+++ b/gr-fcd/lib/fcd/fcd.c
diff --git a/gr-fcd/lib/fcd.h b/gr-fcd/lib/fcd/fcd.h
index 50983b473..50983b473 100644
--- a/gr-fcd/lib/fcd.h
+++ b/gr-fcd/lib/fcd/fcd.h
diff --git a/gr-fcd/lib/fcdhidcmd.h b/gr-fcd/lib/fcd/fcdhidcmd.h
index fad55f15f..fad55f15f 100644
--- a/gr-fcd/lib/fcdhidcmd.h
+++ b/gr-fcd/lib/fcd/fcdhidcmd.h
diff --git a/gr-fcd/lib/hid/Makefile.am b/gr-fcd/lib/hid/Makefile.am
new file mode 100644
index 000000000..2ad4796fe
--- /dev/null
+++ b/gr-fcd/lib/hid/Makefile.am
@@ -0,0 +1,44 @@
+#
+# Copyright 2012 Free Software Foundation, Inc.
+# 
+# This file is part of GNU Radio
+# 
+# GNU Radio is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3, or (at your option)
+# any later version.
+# 
+# GNU Radio is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+# 
+# You should have received a copy of the GNU General Public License
+# along with GNU Radio; see the file COPYING.  If not, write to
+# the Free Software Foundation, Inc., 51 Franklin Street,
+# Boston, MA 02110-1301, USA.
+# 
+
+include $(top_srcdir)/Makefile.common
+
+AM_CPPFLAGS = \
+	$(STD_DEFINES_AND_INCLUDES) \
+	$(WITH_INCLUDES) \
+	$(USB_CPPFLAGS)
+
+noinst_LTLIBRARIES = libhid.la
+
+libhid_la_SOURCES =
+
+if FCD_MACOSX
+    libhid_la_SOURCES += hidmac.c
+else if FCD_WINDOWS
+    libhid_la_SOURCES += hidwin.c
+else
+    libhid_la_SOURCES += hid-libusb.c
+endif
+
+noinst_HEADERS = hidapi.h
+
+libhid_la_LIBADD = $(USB_LIBS)
+
diff --git a/gr-fcd/lib/hid-libusb.c b/gr-fcd/lib/hid/hid-libusb.c
index cf3172a84..cf3172a84 100644
--- a/gr-fcd/lib/hid-libusb.c
+++ b/gr-fcd/lib/hid/hid-libusb.c
diff --git a/gr-fcd/lib/hidapi.h b/gr-fcd/lib/hid/hidapi.h
index 6c8c48396..6c8c48396 100644
--- a/gr-fcd/lib/hidapi.h
+++ b/gr-fcd/lib/hid/hidapi.h
diff --git a/gr-fcd/lib/hidmac.c b/gr-fcd/lib/hid/hidmac.c
index 276541be1..276541be1 100644
--- a/gr-fcd/lib/hidmac.c
+++ b/gr-fcd/lib/hid/hidmac.c
diff --git a/gr-fcd/lib/hidwin.c b/gr-fcd/lib/hid/hidwin.c
index 26d870fd8..26d870fd8 100644
--- a/gr-fcd/lib/hidwin.c
+++ b/gr-fcd/lib/hid/hidwin.c