mirror of https://github.com/xzeldon/htop.git
Merge branch 'automake-compat'
This commit is contained in:
commit
e28d022716
22
Makefile.am
22
Makefile.am
|
@ -1,3 +1,11 @@
|
||||||
|
if !HTOP_PCP
|
||||||
|
bin_PROGRAMS = htop
|
||||||
|
myhtopplatprogram = htop.c
|
||||||
|
else
|
||||||
|
bin_PROGRAMS = pcp-htop
|
||||||
|
myhtopplatprogram = pcp-htop.c
|
||||||
|
endif
|
||||||
|
|
||||||
dist_man_MANS = htop.1
|
dist_man_MANS = htop.1
|
||||||
EXTRA_DIST = \
|
EXTRA_DIST = \
|
||||||
$(dist_man_MANS) \
|
$(dist_man_MANS) \
|
||||||
|
@ -181,7 +189,6 @@ linux_platform_sources = \
|
||||||
|
|
||||||
if HTOP_LINUX
|
if HTOP_LINUX
|
||||||
AM_LDFLAGS += -rdynamic
|
AM_LDFLAGS += -rdynamic
|
||||||
myhtopplatprogram = htop
|
|
||||||
myhtopplatheaders = $(linux_platform_headers)
|
myhtopplatheaders = $(linux_platform_headers)
|
||||||
myhtopplatsources = $(linux_platform_sources)
|
myhtopplatsources = $(linux_platform_sources)
|
||||||
endif
|
endif
|
||||||
|
@ -214,7 +221,6 @@ freebsd_platform_sources = \
|
||||||
zfs/ZfsCompressedArcMeter.c
|
zfs/ZfsCompressedArcMeter.c
|
||||||
|
|
||||||
if HTOP_FREEBSD
|
if HTOP_FREEBSD
|
||||||
myhtopplatprogram = htop
|
|
||||||
myhtopplatheaders = $(freebsd_platform_headers)
|
myhtopplatheaders = $(freebsd_platform_headers)
|
||||||
myhtopplatsources = $(freebsd_platform_sources)
|
myhtopplatsources = $(freebsd_platform_sources)
|
||||||
endif
|
endif
|
||||||
|
@ -240,7 +246,6 @@ dragonflybsd_platform_sources = \
|
||||||
generic/uname.c
|
generic/uname.c
|
||||||
|
|
||||||
if HTOP_DRAGONFLYBSD
|
if HTOP_DRAGONFLYBSD
|
||||||
myhtopplatprogram = htop
|
|
||||||
myhtopplatheaders = $(dragonflybsd_platform_headers)
|
myhtopplatheaders = $(dragonflybsd_platform_headers)
|
||||||
myhtopplatsources = $(dragonflybsd_platform_sources)
|
myhtopplatsources = $(dragonflybsd_platform_sources)
|
||||||
endif
|
endif
|
||||||
|
@ -266,7 +271,6 @@ netbsd_platform_sources = \
|
||||||
netbsd/NetBSDProcessList.c
|
netbsd/NetBSDProcessList.c
|
||||||
|
|
||||||
if HTOP_NETBSD
|
if HTOP_NETBSD
|
||||||
myhtopplatprogram = htop
|
|
||||||
myhtopplatheaders = $(netbsd_platform_headers)
|
myhtopplatheaders = $(netbsd_platform_headers)
|
||||||
myhtopplatsources = $(netbsd_platform_sources)
|
myhtopplatsources = $(netbsd_platform_sources)
|
||||||
endif
|
endif
|
||||||
|
@ -292,7 +296,6 @@ openbsd_platform_sources = \
|
||||||
openbsd/Platform.c
|
openbsd/Platform.c
|
||||||
|
|
||||||
if HTOP_OPENBSD
|
if HTOP_OPENBSD
|
||||||
myhtopplatprogram = htop
|
|
||||||
myhtopplatheaders = $(openbsd_platform_headers)
|
myhtopplatheaders = $(openbsd_platform_headers)
|
||||||
myhtopplatsources = $(openbsd_platform_sources)
|
myhtopplatsources = $(openbsd_platform_sources)
|
||||||
endif
|
endif
|
||||||
|
@ -326,7 +329,6 @@ darwin_platform_sources = \
|
||||||
|
|
||||||
if HTOP_DARWIN
|
if HTOP_DARWIN
|
||||||
AM_LDFLAGS += -framework IOKit -framework CoreFoundation
|
AM_LDFLAGS += -framework IOKit -framework CoreFoundation
|
||||||
myhtopplatprogram = htop
|
|
||||||
myhtopplatheaders = $(darwin_platform_headers)
|
myhtopplatheaders = $(darwin_platform_headers)
|
||||||
myhtopplatsources = $(darwin_platform_sources)
|
myhtopplatsources = $(darwin_platform_sources)
|
||||||
endif
|
endif
|
||||||
|
@ -357,7 +359,6 @@ solaris_platform_sources = \
|
||||||
zfs/ZfsCompressedArcMeter.c
|
zfs/ZfsCompressedArcMeter.c
|
||||||
|
|
||||||
if HTOP_SOLARIS
|
if HTOP_SOLARIS
|
||||||
myhtopplatprogram = htop
|
|
||||||
myhtopplatheaders = $(solaris_platform_headers)
|
myhtopplatheaders = $(solaris_platform_headers)
|
||||||
myhtopplatsources = $(solaris_platform_sources)
|
myhtopplatsources = $(solaris_platform_sources)
|
||||||
endif
|
endif
|
||||||
|
@ -393,10 +394,9 @@ pcp_platform_sources = \
|
||||||
zfs/ZfsCompressedArcMeter.c
|
zfs/ZfsCompressedArcMeter.c
|
||||||
|
|
||||||
if HTOP_PCP
|
if HTOP_PCP
|
||||||
myhtopplatprogram = pcp-htop
|
|
||||||
myhtopplatheaders = $(pcp_platform_headers)
|
myhtopplatheaders = $(pcp_platform_headers)
|
||||||
myhtopplatsources = $(pcp_platform_sources)
|
myhtopplatsources = $(pcp_platform_sources)
|
||||||
pcp_htop_SOURCES = $(myhtopplatprogram).c $(myhtopheaders) $(myhtopplatheaders) $(myhtopsources) $(myhtopplatsources)
|
pcp_htop_SOURCES = $(myhtopplatprogram) $(myhtopheaders) $(myhtopplatheaders) $(myhtopsources) $(myhtopplatsources)
|
||||||
endif
|
endif
|
||||||
|
|
||||||
# Unsupported
|
# Unsupported
|
||||||
|
@ -416,15 +416,13 @@ unsupported_platform_sources = \
|
||||||
unsupported/UnsupportedProcessList.c
|
unsupported/UnsupportedProcessList.c
|
||||||
|
|
||||||
if HTOP_UNSUPPORTED
|
if HTOP_UNSUPPORTED
|
||||||
myhtopplatprogram = htop
|
|
||||||
myhtopplatsources = $(unsupported_platform_sources)
|
myhtopplatsources = $(unsupported_platform_sources)
|
||||||
myhtopplatheaders = $(unsupported_platform_headers)
|
myhtopplatheaders = $(unsupported_platform_headers)
|
||||||
endif
|
endif
|
||||||
|
|
||||||
# ----
|
# ----
|
||||||
|
|
||||||
bin_PROGRAMS = $(myhtopplatprogram)
|
htop_SOURCES = $(myhtopplatprogram) $(myhtopheaders) $(myhtopplatheaders) $(myhtopsources) $(myhtopplatsources)
|
||||||
htop_SOURCES = $(myhtopplatprogram).c $(myhtopheaders) $(myhtopplatheaders) $(myhtopsources) $(myhtopplatsources)
|
|
||||||
nodist_htop_SOURCES = config.h
|
nodist_htop_SOURCES = config.h
|
||||||
|
|
||||||
target:
|
target:
|
||||||
|
|
Loading…
Reference in New Issue