Index: /trunk/Ohana/src/addstar/Makefile
===================================================================
--- /trunk/Ohana/src/addstar/Makefile	(revision 11879)
+++ /trunk/Ohana/src/addstar/Makefile	(revision 11880)
@@ -12,5 +12,8 @@
 include ../../Makefile.Common
 
-LDFLAGS := 	-lkapa -ldvo -lFITS -lohana $(LDFLAGS)
+# programs may add their own internal requirements here
+FULL_CFLAGS   = $(BASE_CFLAGS)
+FULL_CPPFLAGS = $(BASE_CPPFLAGS)
+FULL_LDFLAGS  = -lkapa -ldvo -lFITS -lohana $(BASE_LDFLAGS)
 
 addstar     : $(BIN)/addstar.$(ARCH)
Index: /trunk/Ohana/src/delstar/Makefile
===================================================================
--- /trunk/Ohana/src/delstar/Makefile	(revision 11879)
+++ /trunk/Ohana/src/delstar/Makefile	(revision 11880)
@@ -12,6 +12,8 @@
 include ../../Makefile.Common
 
-CFLAGS	:=	$(CFLAGS) -fPIC
-LDFLAGS := 	-ldvo -lFITS -lohana $(LDFLAGS)
+# programs may add their own internal requirements here
+FULL_CFLAGS   = $(BASE_CFLAGS)
+FULL_CPPFLAGS = $(BASE_CPPFLAGS)
+FULL_LDFLAGS  = -ldvo -lFITS -lohana $(BASE_LDFLAGS)
 
 delstar: $(BIN)/delstar.$(ARCH)
Index: /trunk/Ohana/src/elixir/Makefile
===================================================================
--- /trunk/Ohana/src/elixir/Makefile	(revision 11879)
+++ /trunk/Ohana/src/elixir/Makefile	(revision 11880)
@@ -12,5 +12,8 @@
 include ../../Makefile.Common
 
-LDFLAGS := 	-ldvo -lFITS -lohana $(LDFLAGS)
+# programs may add their own internal requirements here
+FULL_CFLAGS   = $(BASE_CFLAGS)
+FULL_CPPFLAGS = $(BASE_CPPFLAGS)
+FULL_LDFLAGS  = -ldvo -lFITS -lohana $(BASE_LDFLAGS)
 
 elixir: $(BIN)/elixir.$(ARCH)
Index: /trunk/Ohana/src/fixcat/Makefile
===================================================================
--- /trunk/Ohana/src/fixcat/Makefile	(revision 11879)
+++ /trunk/Ohana/src/fixcat/Makefile	(revision 11880)
@@ -12,5 +12,8 @@
 include ../../Makefile.Common
 
-LDFLAGS := 	-ldvo -lFITS -lohana $(LDFLAGS)
+# programs may add their own internal requirements here
+FULL_CFLAGS   = $(BASE_CFLAGS)
+FULL_CPPFLAGS = $(BASE_CPPFLAGS)
+FULL_LDFLAGS  = -ldvo -lFITS -lohana $(BASE_LDFLAGS)
 
 uniphot: $(BIN)/uniphot.$(ARCH)
Index: /trunk/Ohana/src/gastro/Makefile
===================================================================
--- /trunk/Ohana/src/gastro/Makefile	(revision 11879)
+++ /trunk/Ohana/src/gastro/Makefile	(revision 11880)
@@ -12,5 +12,8 @@
 include ../../Makefile.Common
 
-LDFLAGS := 	-ldvo -lFITS -lohana $(LDFLAGS)
+# programs may add their own internal requirements here
+FULL_CFLAGS   = $(BASE_CFLAGS)
+FULL_CPPFLAGS = $(BASE_CPPFLAGS)
+FULL_LDFLAGS  = -ldvo -lFITS -lohana $(BASE_LDFLAGS)
 
 gastro: $(BIN)/gastro.$(ARCH)
Index: /trunk/Ohana/src/gastro2/Makefile
===================================================================
--- /trunk/Ohana/src/gastro2/Makefile	(revision 11879)
+++ /trunk/Ohana/src/gastro2/Makefile	(revision 11880)
@@ -12,5 +12,8 @@
 include ../../Makefile.Common
 
-LDFLAGS := 	-ldvo -lFITS -lohana $(LDFLAGS)
+# programs may add their own internal requirements here
+FULL_CFLAGS   = $(BASE_CFLAGS)
+FULL_CPPFLAGS = $(BASE_CPPFLAGS)
+FULL_LDFLAGS  = -ldvo -lFITS -lohana $(BASE_LDFLAGS)
 
 gastro2: $(BIN)/gastro2.$(ARCH)
Index: /trunk/Ohana/src/gcompare/Makefile
===================================================================
--- /trunk/Ohana/src/gcompare/Makefile	(revision 11879)
+++ /trunk/Ohana/src/gcompare/Makefile	(revision 11880)
@@ -12,5 +12,8 @@
 include ../../Makefile.Common
 
-LDFLAGS := 	-ldvo -lFITS -lohana $(LDFLAGS)
+# programs may add their own internal requirements here
+FULL_CFLAGS   = $(BASE_CFLAGS)
+FULL_CPPFLAGS = $(BASE_CPPFLAGS)
+FULL_LDFLAGS  = -ldvo -lFITS -lohana $(BASE_LDFLAGS)
 
 gcompare: $(BIN)/gcompare.$(ARCH)
Index: /trunk/Ohana/src/getstar/Makefile
===================================================================
--- /trunk/Ohana/src/getstar/Makefile	(revision 11879)
+++ /trunk/Ohana/src/getstar/Makefile	(revision 11880)
@@ -12,5 +12,8 @@
 include ../../Makefile.Common
 
-LDFLAGS := 	-ldvo -lFITS -lohana $(LDFLAGS)
+# programs may add their own internal requirements here
+FULL_CFLAGS   = $(BASE_CFLAGS)
+FULL_CPPFLAGS = $(BASE_CPPFLAGS)
+FULL_LDFLAGS  = -ldvo -lFITS -lohana $(BASE_LDFLAGS)
 
 getstar: $(BIN)/getstar.$(ARCH)
Index: /trunk/Ohana/src/gophot/Makefile
===================================================================
--- /trunk/Ohana/src/gophot/Makefile	(revision 11879)
+++ /trunk/Ohana/src/gophot/Makefile	(revision 11880)
@@ -12,5 +12,8 @@
 include ../../Makefile.Common
 
-LDFLAGS := 	-ldvo -lFITS -lohana $(LDFLAGS)
+# programs may add their own internal requirements here
+FULL_CFLAGS   = $(BASE_CFLAGS)
+FULL_CPPFLAGS = $(BASE_CPPFLAGS)
+FULL_LDFLAGS  = -ldvo -lFITS -lohana $(BASE_LDFLAGS)
 
 gophot: $(BIN)/gophot.$(ARCH)
Index: /trunk/Ohana/src/imclean/Makefile
===================================================================
--- /trunk/Ohana/src/imclean/Makefile	(revision 11879)
+++ /trunk/Ohana/src/imclean/Makefile	(revision 11880)
@@ -12,5 +12,8 @@
 include ../../Makefile.Common
 
-LDFLAGS := 	-ldvo -lFITS -lohana $(LDFLAGS)
+# programs may add their own internal requirements here
+FULL_CFLAGS   = $(BASE_CFLAGS)
+FULL_CPPFLAGS = $(BASE_CPPFLAGS)
+FULL_LDFLAGS  = -ldvo -lFITS -lohana $(BASE_LDFLAGS)
 
 imclean: $(BIN)/imclean.$(ARCH)
Index: /trunk/Ohana/src/imregister/Makefile
===================================================================
--- /trunk/Ohana/src/imregister/Makefile	(revision 11879)
+++ /trunk/Ohana/src/imregister/Makefile	(revision 11880)
@@ -19,5 +19,8 @@
 SPREG   =	$(HOME)/spreg
 
-LDFLAGS := 	-ldvo -lFITS -lohana $(LDFLAGS)
+# programs may add their own internal requirements here
+FULL_CFLAGS   = $(BASE_CFLAGS)
+FULL_CPPFLAGS = $(BASE_CPPFLAGS)
+FULL_LDFLAGS  = -ldvo -lFITS -lohana $(BASE_LDFLAGS)
 
 # programs which should be installed
Index: /trunk/Ohana/src/kapa/Makefile
===================================================================
--- /trunk/Ohana/src/kapa/Makefile	(revision 11879)
+++ /trunk/Ohana/src/kapa/Makefile	(revision 11880)
@@ -14,5 +14,9 @@
 include ../../Makefile.Common
 
-LDFLAGS := 	-lkapa -ldvo -lFITS -lohana $(LDFLAGS)
+# programs may add their own internal requirements here
+FULL_CFLAGS   = $(BASE_CFLAGS)
+FULL_CPPFLAGS = $(BASE_CPPFLAGS)
+FULL_LDFLAGS  = -lkapa -ldvo -lFITS -lohana $(BASE_LDFLAGS)
+
 LDDEPS  = $(DESTLIB)/libkapa.a $(DESTLIB)/libdvo.a $(DESTLIB)/libFITS.a $(DESTLIB)/libohana.a
 INDEPS  = $(DESTINC)/kapa.h $(DESTINC)/dvo.h $(DESTINC)/gfitsio.h $(DESTINC)/ohana.h
Index: /trunk/Ohana/src/kii/Makefile
===================================================================
--- /trunk/Ohana/src/kii/Makefile	(revision 11879)
+++ /trunk/Ohana/src/kii/Makefile	(revision 11880)
@@ -18,5 +18,8 @@
 include ../../Makefile.Common
 
-LDFLAGS := 	-lkapa -ldvo -lFITS -lohana $(LDFLAGS)
+# programs may add their own internal requirements here
+FULL_CFLAGS   = $(BASE_CFLAGS)
+FULL_CPPFLAGS = $(BASE_CPPFLAGS)
+FULL_LDFLAGS  = -lkapa -ldvo -lFITS -lohana $(BASE_LDFLAGS)
 
 kii: $(BIN)/kii.$(ARCH)
Index: /trunk/Ohana/src/libautocode/Makefile
===================================================================
--- /trunk/Ohana/src/libautocode/Makefile	(revision 11879)
+++ /trunk/Ohana/src/libautocode/Makefile	(revision 11880)
@@ -16,5 +16,8 @@
 include ../../Makefile.Common
 
-CFLAGS	:=	$(CFLAGS) -fPIC
+# programs may add their own internal requirements here
+FULL_CFLAGS   = $(BASE_CFLAGS) -fPIC
+FULL_CPPFLAGS = $(BASE_CPPFLAGS)
+FULL_LDFLAGS  = $(BASE_LDFLAGS)
 
 latex:    $(LIBTEX)
Index: /trunk/Ohana/src/libdvo/Makefile
===================================================================
--- /trunk/Ohana/src/libdvo/Makefile	(revision 11879)
+++ /trunk/Ohana/src/libdvo/Makefile	(revision 11880)
@@ -15,5 +15,8 @@
 include ../../Makefile.Common
 
-CFLAGS	:=	$(CFLAGS) -fPIC
+# programs may add their own internal requirements here
+FULL_CFLAGS   = $(BASE_CFLAGS) -fPIC
+FULL_CPPFLAGS = $(BASE_CPPFLAGS)
+FULL_LDFLAGS  = $(BASE_LDFLAGS)
 
 default: install
Index: /trunk/Ohana/src/libfits/Makefile
===================================================================
--- /trunk/Ohana/src/libfits/Makefile	(revision 11879)
+++ /trunk/Ohana/src/libfits/Makefile	(revision 11880)
@@ -14,6 +14,8 @@
 include ../../Makefile.Common
 
-CFLAGS	:=	$(CFLAGS) -fPIC
-LDFLAGS := 	$(LDFLAGS) -lFITS -lohana
+# programs may add their own internal requirements here
+FULL_CFLAGS   = $(BASE_CFLAGS) -fPIC
+FULL_CPPFLAGS = $(BASE_CPPFLAGS)
+FULL_LDFLAGS  = $(BASE_LDFLAGS)
 
 install: $(DESTLIB)/libFITS.a $(DESTLIB)/libFITS.so $(DESTMAN)/fits.1
Index: /trunk/Ohana/src/libkapa/Makefile
===================================================================
--- /trunk/Ohana/src/libkapa/Makefile	(revision 11879)
+++ /trunk/Ohana/src/libkapa/Makefile	(revision 11880)
@@ -11,5 +11,8 @@
 include ../../Makefile.Common
 
-CFLAGS	:=	$(CFLAGS) -fPIC
+# programs may add their own internal requirements here
+FULL_CFLAGS   = $(BASE_CFLAGS) -fPIC
+FULL_CPPFLAGS = $(BASE_CPPFLAGS)
+FULL_LDFLAGS  = $(BASE_LDFLAGS)
 
 install: $(DESTINC)/kapa.h $(DESTLIB)/libkapa.a $(DESTLIB)/libkapa.so
Index: /trunk/Ohana/src/libohana/Makefile
===================================================================
--- /trunk/Ohana/src/libohana/Makefile	(revision 11879)
+++ /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
Index: /trunk/Ohana/src/libtap/Makefile
===================================================================
--- /trunk/Ohana/src/libtap/Makefile	(revision 11879)
+++ /trunk/Ohana/src/libtap/Makefile	(revision 11880)
@@ -12,5 +12,8 @@
 include ../../Makefile.Common
 
-CFLAGS	:=	$(CFLAGS) -fPIC
+# programs may add their own internal requirements here
+FULL_CFLAGS   = $(BASE_CFLAGS) -fPIC
+FULL_CPPFLAGS = $(BASE_CPPFLAGS)
+FULL_LDFLAGS  = $(BASE_LDFLAGS)
 
 install: $(DESTLIB)/libtap_ohana.a $(DESTLIB)/libtap_ohana.so
Index: /trunk/Ohana/src/lightcurve/Makefile
===================================================================
--- /trunk/Ohana/src/lightcurve/Makefile	(revision 11879)
+++ /trunk/Ohana/src/lightcurve/Makefile	(revision 11880)
@@ -12,5 +12,8 @@
 include ../../Makefile.Common
 
-LDFLAGS := 	-ldvo -lFITS -lohana $(LDFLAGS)
+# programs may add their own internal requirements here
+FULL_CFLAGS   = $(BASE_CFLAGS)
+FULL_CPPFLAGS = $(BASE_CPPFLAGS)
+FULL_LDFLAGS  = -ldvo -lFITS -lohana $(BASE_LDFLAGS)
 
 lightcurve: $(BIN)/lightcurve.$(ARCH)
Index: /trunk/Ohana/src/markrock/Makefile
===================================================================
--- /trunk/Ohana/src/markrock/Makefile	(revision 11879)
+++ /trunk/Ohana/src/markrock/Makefile	(revision 11880)
@@ -12,5 +12,8 @@
 include ../../Makefile.Common
 
-LDFLAGS := 	-ldvo -lFITS -lohana $(LDFLAGS)
+# programs may add their own internal requirements here
+FULL_CFLAGS   = $(BASE_CFLAGS)
+FULL_CPPFLAGS = $(BASE_CPPFLAGS)
+FULL_LDFLAGS  = -ldvo -lFITS -lohana $(BASE_LDFLAGS)
 
 markrock: $(BIN)/markrock.$(ARCH)
Index: /trunk/Ohana/src/markstar/Makefile
===================================================================
--- /trunk/Ohana/src/markstar/Makefile	(revision 11879)
+++ /trunk/Ohana/src/markstar/Makefile	(revision 11880)
@@ -12,5 +12,8 @@
 include ../../Makefile.Common
 
-LDFLAGS := 	-ldvo -lFITS -lohana $(LDFLAGS)
+# programs may add their own internal requirements here
+FULL_CFLAGS   = $(BASE_CFLAGS)
+FULL_CPPFLAGS = $(BASE_CPPFLAGS)
+FULL_LDFLAGS  = -ldvo -lFITS -lohana $(BASE_LDFLAGS)
 
 markstar: $(BIN)/markstar.$(ARCH)
Index: /trunk/Ohana/src/misc/Makefile
===================================================================
--- /trunk/Ohana/src/misc/Makefile	(revision 11879)
+++ /trunk/Ohana/src/misc/Makefile	(revision 11880)
@@ -11,9 +11,10 @@
 INC	=	$(HOME)/include
 
-CFLAGS	=	-I$(INC) -I$(DESTINC) $(INCDIRS) -D$(ARCH)
-LDFLAGS = 	-L$(LIB) -L$(DESTLIB) $(LIBDIRS) $(LIBFLAGS)
-LDFLAGS := 	-ldvo -lFITS -lohana $(LDFLAGS)
+FULL_CFLAGS   =	$(CFLAGS)
+FULL_CPPFLAGS = $(CPPFLAGS) -I$(INC) -I$(DESTINC) $(INCDIRS) -D$(ARCH)
+FULL_LDFLAGS  = $(LDFLAGS) -L$(LIB) -L$(DESTLIB) $(LIBDIRS) -ldvo -lFITS -lohana $(LIBFLAGS)
 
 # these are all programs which just depend on a single c file: foo : foo.c
+# we use a special set of rules in this directory which expect this simplification
 
 PROGRAMS = gconfig mknames fhead ftable fields list_astro glockfile \
@@ -45,9 +46,9 @@
 
 %.$(ARCH).o : %.c
-	$(CC) $(CFLAGS) -c $< -o $@
+	$(CC) $(FULL_CFLAGS) $(FULL_CPPFLAGS) -c $< -o $@
 
 $(BIN)/%.$(ARCH) : $(SRC)/%.$(ARCH).o
 	@if [ ! -d $(BIN) ]; then mkdir -p $(BIN); fi
-	$(CC) -o $@ $^ $(LDFLAGS)
+	$(CC) $(FULL_CFLAGS) -o $@ $^ $(FULL_LDFLAGS)
 
 $(DESTBIN)/%: $(BIN)/%.$(ARCH) 
Index: /trunk/Ohana/src/mosastro/Makefile
===================================================================
--- /trunk/Ohana/src/mosastro/Makefile	(revision 11879)
+++ /trunk/Ohana/src/mosastro/Makefile	(revision 11880)
@@ -12,5 +12,8 @@
 include ../../Makefile.Common
 
-LDFLAGS := 	-ldvo -lFITS -lohana $(LDFLAGS)
+# programs may add their own internal requirements here
+FULL_CFLAGS   = $(BASE_CFLAGS)
+FULL_CPPFLAGS = $(BASE_CPPFLAGS)
+FULL_LDFLAGS  = -ldvo -lFITS -lohana $(BASE_LDFLAGS)
 
 mosastro: $(BIN)/mosastro.$(ARCH)
Index: /trunk/Ohana/src/nightd/Makefile
===================================================================
--- /trunk/Ohana/src/nightd/Makefile	(revision 11879)
+++ /trunk/Ohana/src/nightd/Makefile	(revision 11880)
@@ -12,5 +12,8 @@
 include ../../Makefile.Common
 
-LDFLAGS := 	-ldvo -lFITS -lohana $(LDFLAGS)
+# programs may add their own internal requirements here
+FULL_CFLAGS   = $(BASE_CFLAGS)
+FULL_CPPFLAGS = $(BASE_CPPFLAGS)
+FULL_LDFLAGS  = -ldvo -lFITS -lohana $(BASE_LDFLAGS)
 
 nightd: $(BIN)/nightd.$(ARCH)
Index: /trunk/Ohana/src/photdbc/Makefile
===================================================================
--- /trunk/Ohana/src/photdbc/Makefile	(revision 11879)
+++ /trunk/Ohana/src/photdbc/Makefile	(revision 11880)
@@ -12,5 +12,8 @@
 include ../../Makefile.Common
 
-LDFLAGS := 	-ldvo -lFITS -lohana $(LDFLAGS)
+# programs may add their own internal requirements here
+FULL_CFLAGS   = $(BASE_CFLAGS)
+FULL_CPPFLAGS = $(BASE_CPPFLAGS)
+FULL_LDFLAGS  = -ldvo -lFITS -lohana $(BASE_LDFLAGS)
 
 photdbc: $(BIN)/photdbc.$(ARCH)
Index: /trunk/Ohana/src/relastro/Makefile
===================================================================
--- /trunk/Ohana/src/relastro/Makefile	(revision 11879)
+++ /trunk/Ohana/src/relastro/Makefile	(revision 11880)
@@ -12,5 +12,8 @@
 include ../../Makefile.Common
 
-LDFLAGS := 	-ldvo -lFITS -lohana $(LDFLAGS)
+# programs may add their own internal requirements here
+FULL_CFLAGS   = $(BASE_CFLAGS)
+FULL_CPPFLAGS = $(BASE_CPPFLAGS)
+FULL_LDFLAGS  = -ldvo -lFITS -lohana $(BASE_LDFLAGS)
 
 relastro: $(BIN)/relastro.$(ARCH)
Index: /trunk/Ohana/src/relphot/Makefile
===================================================================
--- /trunk/Ohana/src/relphot/Makefile	(revision 11879)
+++ /trunk/Ohana/src/relphot/Makefile	(revision 11880)
@@ -12,5 +12,8 @@
 include ../../Makefile.Common
 
-LDFLAGS := 	-lkapa -ldvo -lFITS -lohana $(LDFLAGS)
+# programs may add their own internal requirements here
+FULL_CFLAGS   = $(BASE_CFLAGS)
+FULL_CPPFLAGS = $(BASE_CPPFLAGS)
+FULL_LDFLAGS  = -lkapa -ldvo -lFITS -lohana $(BASE_LDFLAGS)
 
 relphot: $(BIN)/relphot.$(ARCH)
Index: /trunk/Ohana/src/skycalc/Makefile
===================================================================
--- /trunk/Ohana/src/skycalc/Makefile	(revision 11879)
+++ /trunk/Ohana/src/skycalc/Makefile	(revision 11880)
@@ -4,20 +4,16 @@
 
 include ../../Configure
-HOME	=	.
+HOME	=	$(ROOT)/src/skycalc
+BIN	= 	$(HOME)/bin
+LIB	=	$(HOME)/lib
+SRC	=	$(HOME)/src
+MAN	= 	$(HOME)/doc
+INC	=	$(HOME)/include
+include ../../Makefile.Common
 
-SRC	=	$(HOME)/src
-LIB	=	$(HOME)/lib
-INC	=	$(HOME)/include
-MAN	= 	$(HOME)/doc
-BIN	= 	$(HOME)/bin
-DESTBIN	=	$(BINDIR)
-DESTLIB	=	$(LIBDIR)
-DESTINC	=	$(INCDIR)
-DESTMAN	=	$(MANDIR)
-
-INCS	=	-I$(INC) -I$(INCDIR)
-LIBS	= 	-L$(LIB) -L$(LIBDIR)
-CFLAGS	=	-g -o $*.$(ARCH).o $(INCS)
-CCFLAGS	=	$(INCS) $(LIBS)
+# programs may add their own internal requirements here
+FULL_CFLAGS   = $(BASE_CFLAGS)
+FULL_CPPFLAGS = $(BASE_CPPFLAGS)
+FULL_LDFLAGS  = $(BASE_LDFLAGS)
 
 skycalc: $(DESTLIB)/libskycalc.a
Index: /trunk/Ohana/src/uniphot/Makefile
===================================================================
--- /trunk/Ohana/src/uniphot/Makefile	(revision 11879)
+++ /trunk/Ohana/src/uniphot/Makefile	(revision 11880)
@@ -12,5 +12,8 @@
 include ../../Makefile.Common
 
-LDFLAGS := 	-ldvo -lFITS -lohana $(LDFLAGS)
+# programs may add their own internal requirements here
+FULL_CFLAGS   = $(BASE_CFLAGS)
+FULL_CPPFLAGS = $(BASE_CPPFLAGS)
+FULL_LDFLAGS  = -ldvo -lFITS -lohana $(BASE_LDFLAGS)
 
 uniphot: $(BIN)/uniphot.$(ARCH)