Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 349892
b: refs/heads/master
c: 3b761f9
h: refs/heads/master
v: v3
  • Loading branch information
Arnaldo Carvalho de Melo committed Dec 9, 2012
1 parent f0c6586 commit 72afac9
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 1 deletion.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: f4c8bae1920c459b7b9c12363d11e8a588862e42
refs/heads/master: 3b761f9bda66c24c2686ae795e263cb49f6d8ef4
2 changes: 2 additions & 0 deletions trunk/tools/perf/Documentation/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -223,11 +223,13 @@ install-pdf: pdf
# '$(SHELL_PATH_SQ)' ./install-webdoc.sh $(DESTDIR)$(htmldir)

ifneq ($(MAKECMDGOALS),clean)
ifneq ($(MAKECMDGOALS),tags)
$(OUTPUT)PERF-VERSION-FILE: .FORCE-PERF-VERSION-FILE
$(QUIET_SUBDIR0)../ $(QUIET_SUBDIR1) $(OUTPUT)PERF-VERSION-FILE

-include $(OUTPUT)PERF-VERSION-FILE
endif
endif

#
# Determine "include::" file references in asciidoc files.
Expand Down
4 changes: 4 additions & 0 deletions trunk/tools/perf/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -154,6 +154,7 @@ INSTALL = install
SPARSE_FLAGS = -D__BIG_ENDIAN__ -D__powerpc__

ifneq ($(MAKECMDGOALS),clean)
ifneq ($(MAKECMDGOALS),tags)
-include config/feature-tests.mak

ifeq ($(call try-cc,$(SOURCE_HELLO),$(CFLAGS) -Werror -fstack-protector-all,-fstack-protector-all),y)
Expand Down Expand Up @@ -207,6 +208,7 @@ ifeq ($(call try-cc,$(SOURCE_BIONIC),$(CFLAGS),bionic),y)
EXTLIBS := $(filter-out -lpthread,$(EXTLIBS))
BASIC_CFLAGS += -I.
endif
endif # MAKECMDGOALS != tags
endif # MAKECMDGOALS != clean

# Guard against environment variables
Expand Down Expand Up @@ -525,6 +527,7 @@ PERFLIBS = $(LIB_FILE) $(LIBTRACEEVENT)
# Platform specific tweaks
#
ifneq ($(MAKECMDGOALS),clean)
ifneq ($(MAKECMDGOALS),tags)

# We choose to avoid "if .. else if .. else .. endif endif"
# because maintaining the nesting to match is a pain. If
Expand Down Expand Up @@ -841,6 +844,7 @@ ifdef ASCIIDOC8
export ASCIIDOC8
endif

endif # MAKECMDGOALS != tags
endif # MAKECMDGOALS != clean

# Shell quote (do not use $(call) to accommodate ancient setups);
Expand Down

0 comments on commit 72afac9

Please sign in to comment.