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>

diff --git a/configure.ac b/configure.ac
index 187af4fb5d71b004c794c08a2ee339f2337af9d1..78f5adbb82a7580791eae1fe13b4fa30c625b766 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -18,7 +18,7 @@ dnl
 dnl Process this file with autoconf to create configure.
 
 AC_PREREQ(2.57)
 dnl Process this file with autoconf to create configure.
 
 AC_PREREQ(2.57)

-AC_INIT([altos], 0.9.4.1)
+AC_INIT([altos], 0.9.4.2)

 AC_CONFIG_SRCDIR([src/ao.h])
 AM_INIT_AUTOMAKE([foreign dist-bzip2])
 AM_MAINTAINER_MODE
 AC_CONFIG_SRCDIR([src/ao.h])
 AM_INIT_AUTOMAKE([foreign dist-bzip2])
 AM_MAINTAINER_MODE

diff --git a/src/Makefile.proto b/src/Makefile.proto
index 309fd75d0de29751b94f8804a967d53b2b42f418..d4a8c4ea173a0681bd8c698091455e3c80b34c5e 100644 (file)
--- 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.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
 
 
 distclean:     clean
 

diff --git a/src/ao_product.c b/src/ao_product.c
index bb42e92c73768de449af11a0bd70eb9d025415f0..fb59580b8d4b123b729cf0a0712495282eac8da5 100644 (file)
--- a/src/ao_product.c
+++ b/src/ao_product.c
@@ -16,7 +16,7 @@
  */
 
 #include "ao.h"
  */
 
 #include "ao.h"

-#include PRODUCT_DEFS
+#include "ao_product.h"

 
 /* Defines which mark this particular AltOS product */
 
 
 /* Defines which mark this particular AltOS product */