diff options
| author | Dan Nicholson <dbn.lists@gmail.com> | 2011-02-15 06:03:28 -0800 |
|---|---|---|
| committer | Dan Nicholson <dbn.lists@gmail.com> | 2011-02-25 06:30:45 -0800 |
| commit | 61ce915bf78570b7c8d53c118700ef7274bbdfb7 (patch) | |
| tree | ece008a7131adba8ecb7139cd976baa6967f1e51 | |
| parent | 780a77acce1dd369549ece802b3e2c4006058dfe (diff) | |
xfree86: Allow sdksyms.dep to be included portably
Non-GNU makes don't deal with the sinclude or -include variants that
allow Makefile stubs to be created and then included during the build.
Instead, create an empty file at the end of configure so that the
regular include statement can be included. This is how automake handles
automatic source dependencies.
In order to trick automake into not processing the include statement, a
variable is used.
Signed-off-by: Dan Nicholson <dbn.lists@gmail.com>
Tested-by: Alan Coopersmith <alan.coopersmith@oracle.com>
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | hw/xfree86/loader/Makefile.am | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac index f3b293940..e438fa146 100644 --- a/configure.ac +++ b/configure.ac @@ -2173,6 +2173,8 @@ AC_SUBST([libdir]) AC_SUBST([exec_prefix]) AC_SUBST([prefix]) +AC_CONFIG_COMMANDS([sdksyms], [touch hw/xfree86/loader/sdksyms.dep]) + AC_OUTPUT([ Makefile glx/Makefile diff --git a/hw/xfree86/loader/Makefile.am b/hw/xfree86/loader/Makefile.am index 2bac89ac9..7f386ccc0 100644 --- a/hw/xfree86/loader/Makefile.am +++ b/hw/xfree86/loader/Makefile.am @@ -26,4 +26,5 @@ CLEANFILES = sdksyms.c sdksyms.dep sdksyms.dep sdksyms.c: sdksyms.sh CPP='$(CPP)' AWK='$(AWK)' $(srcdir)/sdksyms.sh $(top_srcdir) $(AM_CFLAGS) $(CFLAGS) $(INCLUDES) -sinclude sdksyms.dep +SDKSYMS_DEP = sdksyms.dep +include $(SDKSYMS_DEP) |