From 504ab7ab355652d5d01094c927089029596a0753 Mon Sep 17 00:00:00 2001
From: Keith Packard <keithp@keithp.com>
Date: Wed, 6 Jul 2011 17:49:01 -0700
Subject: altos: product defines are always in ao_product.h

When all products were built in a single directory, each one had a
separate version of ao_product.h. Now that they all reside in
sub-directories, each directory has its own ao_product.h

This change is needed so that other modules in the system can use the
product defines; otherwise, ao_product.h was not built at the right time.

Signed-off-by: Keith Packard <keithp@keithp.com>
---
 src/Makefile.proto | 3 +--
 src/ao_product.c   | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

(limited to 'src')

diff --git a/src/Makefile.proto b/src/Makefile.proto
index 309fd75d..d4a8c4ea 100644
--- a/src/Makefile.proto
+++ b/src/Makefile.proto
@@ -359,8 +359,7 @@ all: ../$(PROG)
 ao_product.h: ao-make-product.5c ../Version
 	$(call quiet,NICKLE,$<) $< -m altusmetrum.org -i $(IDPRODUCT) -p $(PRODUCT) -v $(VERSION) > $@
 
-ao_product.rel: ao_product.c ao_product.h
-	$(call quiet,CC) -c $(CFLAGS) -D PRODUCT_DEFS='\"ao_product.h\"' -o$@ $<
+$(REL): ao_product.h
 
 distclean:	clean
 
diff --git a/src/ao_product.c b/src/ao_product.c
index bb42e92c..fb59580b 100644
--- a/src/ao_product.c
+++ b/src/ao_product.c
@@ -16,7 +16,7 @@
  */
 
 #include "ao.h"
-#include PRODUCT_DEFS
+#include "ao_product.h"
 
 /* Defines which mark this particular AltOS product */
 
-- 
cgit v1.2.3