emo/procps
1
0
Fork 0
Code Issues Pull Requests Packages Releases Activity

Merge branch 'master' into nls

Browse Source 
Conflicts:
	configure.ac
	pmap.c
	ps/Makefile.am
This commit is contained in:
Craig Small
2011-12-26 09:11:27 +11:00
parent 46e51c92e6 2983b30523
commit a99002e3fe
9 changed files with 25 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
top/Makefile.am
View File

@ -1,7 +1,7 @@
AM_CPPFLAGS = -include $(top_builddir)/config.h
AM_CFLAGS = -I../proc -I../include
AM_LDFLAGS = ../proc/libprocfs.la
AM_LDFLAGS = ../proc/libprocps.la
if WITH_NCURSES
usrbin_exec_PROGRAMS = \