summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTavian Barnes <tavianator@gmail.com>2011-01-29 15:06:12 -0500
committerTavian Barnes <tavianator@gmail.com>2011-01-29 15:06:12 -0500
commit48ae67fc81362e25c5a751807bebcdb0f0e238e4 (patch)
treefbd83e263df09d046fe9f31e446d791eba68300f
parente21fab389c2088c9d2ec4a9e4f55892f84193036 (diff)
downloaddimension-48ae67fc81362e25c5a751807bebcdb0f0e238e4.tar.xz
Remove --enable-pgo configure option.
-rw-r--r--Makefile.am23
-rw-r--r--configure.ac8
-rw-r--r--libdimension/Makefile.am20
-rw-r--r--tests/libdimension/Makefile.am7
4 files changed, 3 insertions, 55 deletions
diff --git a/Makefile.am b/Makefile.am
index 5f9bd53..234cdd7 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -26,29 +26,10 @@ SUBDIRS = libdimension \
EXTRA_DIST = autogen.sh
-if PGO
-
-.PHONY: pgo bench doc
-pgo:
- @if [ ! -d $(top_builddir)/libdimension/pgo/.libs ] || [ -z "$$(ls $(top_builddir)/libdimension/pgo/.libs/*.gcda 2>/dev/null)" ]; then \
- $(MAKE) $(AM_MAKEFLAGS) -C libdimension libdimension-pgo.la && \
- $(MAKE) $(AM_MAKEFLAGS) -C tests/libdimension check; \
- fi
- @for pgo in $(top_builddir)/libdimension/pgo/.libs/*; do \
- replacement="$${pgo/_pgo_la/_la}"; \
- if [ "$$pgo" != "$$replacement" ]; then \
- mv "$$pgo" "$$replacement"; \
- fi \
- done
-
-all-recursive check-recursive install-recursive installcheck-recursive distdir: pgo
-
-else ## PGO
-.PHONY: bench doc
-endif ## PGO
-
bench: all-recursive
cd bench && $(MAKE) $(AM_MAKEFLAGS) bench
doc:
cd libdimension && $(MAKE) $(AM_MAKEFLAGS) doc
+
+.PHONY: bench doc
diff --git a/configure.ac b/configure.ac
index 533c635..75a2deb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -54,14 +54,6 @@ AC_ARG_ENABLE([gl],
[enable_gl=yes])
AM_CONDITIONAL([GL], [test "$enable_gl" != "no"])
-dnl Profile-guided optimization (default disabled)
-AC_ARG_ENABLE([pgo],
- [AS_HELP_STRING([--enable-pgo],
- [Enable profile-guided optimization [default=no]])],
- [],
- [enable_pgo=no])
-AM_CONDITIONAL([PGO], [test "$enable_pgo" != "no"])
-
dnl Timing library for benchmarks
PKG_CHECK_MODULES([libsandglass], [libsandglass >= 0.2],
[],
diff --git a/libdimension/Makefile.am b/libdimension/Makefile.am
index 65f41d2..f2778de 100644
--- a/libdimension/Makefile.am
+++ b/libdimension/Makefile.am
@@ -124,27 +124,7 @@ else
libdimension_la_SOURCES += gl-stubs.c
endif
-if PGO
-
-noinst_LTLIBRARIES = libdimension-pgo.la
-libdimension_pgo_la_SOURCES = $(libdimension_la_SOURCES)
-libdimension_pgo_la_LIBADD = $(libdimension_la_LIBADD) -lgcov
-libdimension_pgo_la_CFLAGS = $(AM_CFLAGS) -fprofile-generate=$$(readlink -f $(builddir))/pgo
-
-libdimension_la_CFLAGS += -fprofile-correction -fprofile-use=./pgo
-
-all-local: libdimension.la
- @for Plo in .deps/libdimension_la*.Plo; do \
- [ -f "pgo/.libs/$$(basename $$Plo .Plo).gcda" ] && sed -ri 's|^(libdimension_la-.*).lo: ([^ ])|\1.lo: pgo/.libs/\1.gcda \2|g' "$$Plo"; \
- true; \
- done
-
-clean-pgo:
- rm -rf pgo
-clean-local: clean-docs clean-pgo
-else
clean-local: clean-docs
-endif
doc:
doxygen Doxyfile
diff --git a/tests/libdimension/Makefile.am b/tests/libdimension/Makefile.am
index 651fbaa..8acf2ee 100644
--- a/tests/libdimension/Makefile.am
+++ b/tests/libdimension/Makefile.am
@@ -41,12 +41,7 @@ XFAIL_TESTS += gl-test
endif
libdimension_tests_la_SOURCES = tests.h
-
-if PGO
-libdimension_tests_la_LIBADD = $(top_builddir)/libdimension/libdimension-pgo.la
-else
-libdimension_tests_la_LIBADD = $(top_builddir)/libdimension/libdimension.la
-endif
+libdimension_tests_la_LIBADD = $(top_builddir)/libdimension/libdimension.la
if GLX
libdimension_tests_la_SOURCES += display.c