diff options
| author | Hisham Muhammad <hisham@gobolinux.org> | 2011-11-21 02:52:41 +0000 |
|---|---|---|
| committer | Hisham Muhammad <hisham@gobolinux.org> | 2011-11-21 02:52:41 +0000 |
| commit | bc87a8ff8c5b6374a00a950cd15e1b290d6c5e06 (patch) | |
| tree | 616bbb782feaabc04d48c963ff1b4b1cfec5b267 /Makefile.am | |
| parent | 7ca10817122d3b7b30fabb1cadb75e5ee14b364e (diff) | |
Remove bundled hwloc-1.2.1. Use either native Linux affinity support or an external libhwloc.
(for details see https://sourceforge.net/mailarchive/forum.php?thread_name=CAJpkDYeZpwqcWxZ77wq6bMrnhn-KzkU1xAqb3cU0drfnA3n9FQ%40mail.gmail.com&forum_name=htop-general )
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/Makefile.am b/Makefile.am index 419054e5..b648969b 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,9 +1,5 @@ -if HAVE_BUNDLED_HWLOC -SUBDIRS = hwloc-1.2.1 -endif - -ACLOCAL_AMFLAGS = -I m4 -I hwloc-1.2.1/config +ACLOCAL_AMFLAGS = -I m4 bin_PROGRAMS = htop dist_man_MANS = htop.1 @@ -41,12 +37,6 @@ SUFFIXES = .h BUILT_SOURCES = $(myhtopheaders) htop_SOURCES = $(myhtopheaders) $(myhtopsources) config.h debug.h -if HAVE_BUNDLED_HWLOC -htop_LDADD = $(HWLOC_EMBEDDED_LDADD) $(HWLOC_EMBEDDED_LIBS) -AM_CFLAGS += $(HWLOC_EMBEDDED_CFLAGS) -AM_CPPFLAGS += $(HWLOC_EMBEDDED_CPPFLAGS) -endif - profile: $(MAKE) all CFLAGS="-pg -O2" |