diff options
| author | Ben Widawsky <ben@bwidawsk.net> | 2011-10-31 17:19:54 -0700 |
|---|---|---|
| committer | Ben Widawsky <ben@bwidawsk.net> | 2011-10-31 17:34:16 -0700 |
| commit | 7c8d41f4d959ee5f09c76272589f4e9b7872af52 (patch) | |
| tree | 014850ea43e67099f8b121ea5713e1ffebaa0a2a | |
| parent | 15830ea54be914b1f4005154b2dcba52fa6b6120 (diff) | |
i-g-t/debugger - make the debugger work with distcheck
Signed-off-by: Ben Widawsky <ben@bwidawsk.net>
| -rw-r--r-- | configure.ac | 1 | ||||
| -rw-r--r-- | debugger/Makefile.am | 11 | ||||
| -rw-r--r-- | debugger/system_routine/GNUmakefile.in | 3 | ||||
| -rw-r--r-- | debugger/system_routine/Makefile | 4 |
4 files changed, 15 insertions, 4 deletions
diff --git a/configure.ac b/configure.ac index 92b2372f..946fd958 100644 --- a/configure.ac +++ b/configure.ac @@ -97,6 +97,7 @@ if test "x$SHADER_DEBUGGER" = xyes; then if test -z "$GEN4ASM"; then AC_MSG_ERROR([Cannot find intel-gen4asm in your path; please set GEN4ASM env variable]) else + AC_CONFIG_FILES([debugger/system_routine/GNUmakefile]) AC_DEFINE(HAVE_SHADER_DEBUGGER, 1, [Have shader debugging support]) fi fi diff --git a/debugger/Makefile.am b/debugger/Makefile.am index eff4e2db..9c89a55b 100644 --- a/debugger/Makefile.am +++ b/debugger/Makefile.am @@ -1,10 +1,17 @@ SUBDIRS=system_routine -bin_PROGRAMS = \ +bin_PROGRAMS = # + +if HAVE_SHADER_DEBUGGER +##needed by distcheck +DIST_SUBDIRS=system_routine +EXTRA_DIST=system_routine/ + +bin_PROGRAMS += \ eudb \ debug_rdata \ $(NULL) - +endif LDADD = ../lib/libintel_tools.la $(DRM_LIBS) $(PCIACCESS_LIBS) AM_CFLAGS = $(DRM_CFLAGS) $(PCIACCESS_CFLAGS) $(WARN_CFLAGS) \ diff --git a/debugger/system_routine/GNUmakefile.in b/debugger/system_routine/GNUmakefile.in new file mode 100644 index 00000000..cd29cb52 --- /dev/null +++ b/debugger/system_routine/GNUmakefile.in @@ -0,0 +1,3 @@ +include Makefile +srcdir = @srcdir@ +VPATH = @srcdir@ diff --git a/debugger/system_routine/Makefile b/debugger/system_routine/Makefile index 8cb43c63..981db496 100644 --- a/debugger/system_routine/Makefile +++ b/debugger/system_routine/Makefile @@ -71,7 +71,7 @@ clean : .PHONY : clean distclean: clean - $(RM) help* + $(RM) help* GNUmakefile maintainer-clean: clean @@ -79,6 +79,6 @@ EMPTY_AUTOMAKE_TARGETS = install install-data install-exec uninstall \ install-dvi install-html install-info install-ps \ install-pdf installdirs check installcheck \ mostlyclean dvi pdf ps info html tags ctags \ - distcheck distdir + distdir .PHONY: $(EMPTY_AUTOMAKE_TARGETS) $(EMPTY_AUTOMAKE_TARGETS): |