diff options
| author | Keith Packard <keithp@keithp.com> | 2011-07-06 17:49:01 -0700 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2011-07-06 17:49:01 -0700 |
| commit | 504ab7ab355652d5d01094c927089029596a0753 (patch) | |
| tree | d7ddf716ea8757db227d7acb0f209f900a66b12d | |
| parent | 81cf2e833bedbc1ace8fd310e9e94bfb7673d428 (diff) | |
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>
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | src/Makefile.proto | 3 | ||||
| -rw-r--r-- | src/ao_product.c | 2 |
3 files changed, 3 insertions, 4 deletions
diff --git a/configure.ac b/configure.ac index 187af4fb..78f5adbb 100644 --- a/configure.ac +++ b/configure.ac @@ -18,7 +18,7 @@ dnl 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 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 */ |