Index: trunk/Ohana/src/libohana/Makefile
===================================================================
--- trunk/Ohana/src/libohana/Makefile	(revision 10368)
+++ trunk/Ohana/src/libohana/Makefile	(revision 11880)
@@ -13,7 +13,9 @@
 include ../../Makefile.Common
 
-CFLAGS	:=	$(CFLAGS) -fPIC
-LDFLAGS := 	$(LDFLAGS) -lohana
-TFLAGS  =       $(CFLAGS) $(LDFLAGS) -ltap_ohana
+# programs may add their own internal requirements here
+FULL_CFLAGS   = $(BASE_CFLAGS) -fPIC
+FULL_CPPFLAGS = $(BASE_CPPFLAGS)
+FULL_LDFLAGS  = $(BASE_LDFLAGS)
+TFLAGS        = $(FULL_CFLAGS) $(FULL_LDFLAGS) -ltap_ohana
 
 install: $(DESTLIB)/libohana.a $(DESTLIB)/libohana.so