From 45746fdfa5f6fa485867bdb10d6da91277288f3a Mon Sep 17 00:00:00 2001
From: Werner Almesberger <werner@almesberger.net>
Date: Sun, 29 May 2011 06:03:11 -0300
Subject: [PATCH] dropped f32xbase dependency on Makefile.common

This means that we only depend on f32xbase for atusb-sil (defunct) and
cntr (needs updating), but not for any of the project's main parts.

- makefiles/Makefile.basic: copied over from
  f32xbase/lib/Makefile.common
- makefiles/Makefile.basic (LDLIBS): removed inclusion of libusb
- tools/Makefile.common: use makefiles/Makefile.basic
- install/INSTALL-Ben, prod/doc/setup.hmac: removed f32xbase
  dependency
---
 install/INSTALL-Ben      |  1 -
 makefiles/Makefile.basic | 37 +++++++++++++++++++++++++++++++++++++
 prod/doc/setup.hmac      |  2 --
 tools/Makefile.common    |  4 +---
 4 files changed, 38 insertions(+), 6 deletions(-)
 create mode 100644 makefiles/Makefile.basic

diff --git a/install/INSTALL-Ben b/install/INSTALL-Ben
index c8d40f0..f3d032c 100644
--- a/install/INSTALL-Ben
+++ b/install/INSTALL-Ben
@@ -104,7 +104,6 @@
 7. Build dirtpan, a crude IPv4-over-IEEE 802.15.4 tunnel
 
 	git clone git://projects.qi-hardware.com/ben-wpan.git
-	git clone git://projects.qi-hardware.com/f32xbase.git
 
 	# If compiling dirtpan.c fails due a missing ieee802145.h header,
 	# copy it over from lowpan-tools:
diff --git a/makefiles/Makefile.basic b/makefiles/Makefile.basic
new file mode 100644
index 0000000..daba67b
--- /dev/null
+++ b/makefiles/Makefile.basic
@@ -0,0 +1,37 @@
+#
+# Makefile.basic - Basic makefile for single-executable builds
+#
+# Written 2008, 2011 by Werner Almesberger
+# Copyright 2008, 2011 Werner Almesberger
+#
+# This program 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 2 of the License, or
+# (at your option) any later version.
+#
+
+
+INSTALL_PREFIX = /usr/local
+
+CFLAGS = -Wall
+LDFLAGS =
+LDLIBS =
+
+.PHONY:		all install uninstall clean spotless
+
+all:		$(MAIN)
+
+$(MAIN):	$(MAIN).o $(OBJS)
+		$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(MAIN).o $(OBJS) $(LDLIBS)
+
+install:	$(MAIN)
+		install $(MAIN) $(INSTALL_PREFIX)/bin/
+
+uninstall:
+		rm -f $(INSTALL_PREFIX)/bin/$(MAIN)
+
+clean::
+		rm -f $(MAIN).o $(OBJS)
+
+spotless:	clean
+		rm -f $(MAIN)
diff --git a/prod/doc/setup.hmac b/prod/doc/setup.hmac
index be660fa..df4e7e8 100644
--- a/prod/doc/setup.hmac
+++ b/prod/doc/setup.hmac
@@ -59,7 +59,6 @@ To build the ben-wpan tools and install them under
 run the following commands:
 <PRE>
 git clone git://projects.qi-hardware.com/ben-wpan.git
-git clone git://projects.qi-hardware.com/f32xbase.git
 cd ben-wpan/tools
 make
 make install
@@ -212,7 +211,6 @@ out the project's repository, run these commands:
 
 <PRE>
 git clone git://projects.qi-hardware.com/ben-wpan.git
-git clone git://projects.qi-hardware.com/f32xbase.git
 cd ben-wpan/tools
 </PRE>
 
diff --git a/tools/Makefile.common b/tools/Makefile.common
index 1cb1527..0bc44da 100644
--- a/tools/Makefile.common
+++ b/tools/Makefile.common
@@ -14,10 +14,8 @@ ifeq ($(TARGET),)
 TARGET = host
 endif
 
-F32XBASE = ../../../f32xbase
-
 ifneq ($(MAIN),)
-include $(F32XBASE)/lib/Makefile.common
+include ../../makefiles/Makefile.basic
 endif
 
 CC_host = gcc