Merge branch 'master', remote-tracking branch 'sami/ng'
This commit is contained in:
Craig Small
47
proc/Makefile.am
Normal file
47
proc/Makefile.am
Normal file
@ -0,0 +1,47 @@
|
||||
PACKAGE_VERSION = @PACKAGE_VERSION@
|
||||
AM_CPPFLAGS = -include $(top_builddir)/config.h
|
||||
lib_LTLIBRARIES = libproc-ng.la
|
||||
|
||||
libproc_ng_ladir = $(ladir)
|
||||
libproc_ng_la_LIBADD = $(LIB_KPARTS)
|
||||
libproc_ng_la_LDFLAGS = $(all_libraries) -release $(PACKAGE_VERSION) -no-undefined
|
||||
|
||||
libproc_ng_la_SOURCES = \
|
||||
alloc.c \
|
||||
alloc.h \
|
||||
devname.c \
|
||||
devname.h \
|
||||
escape.c \
|
||||
escape.h \
|
||||
ksym.c \
|
||||
procps.h \
|
||||
pwcache.c \
|
||||
pwcache.h \
|
||||
readproc.c \
|
||||
readproc.h \
|
||||
sig.c \
|
||||
sig.h \
|
||||
slab.c \
|
||||
slab.h \
|
||||
sysinfo.c \
|
||||
sysinfo.h \
|
||||
version.c \
|
||||
version.h \
|
||||
wchan.h \
|
||||
whattime.c \
|
||||
whattime.h
|
||||
|
||||
libproc_ng_la_includedir = $(includedir)/proc/
|
||||
libproc_ng_la_include_HEADERS = \
|
||||
alloc.h \
|
||||
devname.h \
|
||||
escape.h \
|
||||
procps.h \
|
||||
pwcache.h \
|
||||
readproc.h \
|
||||
sig.h \
|
||||
slab.h \
|
||||
sysinfo.h \
|
||||
version.h \
|
||||
wchan.h \
|
||||
whattime.h
|
||||
130
proc/module.mk
130
proc/module.mk
@ -1,130 +0,0 @@
|
||||
# This file gets included into the main Makefile, in the top directory.
|
||||
|
||||
# Ideally, we want something like this:
|
||||
#
|
||||
# /lib/libproc.so.w ELF soname ('w' is a digit, starting from 1)
|
||||
# /lib/procps-x.y.z.so file itself (x.y.z is the procps version)
|
||||
# /lib/libproc.so for linking, UNSUPPORTED
|
||||
# /usr/lib/libproc.a for linking, UNSUPPORTED
|
||||
# proc/libproc.so.w as above, if testing with LD_LIBRARY_PATH
|
||||
# proc/whatever if testing with LD_PRELOAD
|
||||
# proc/libproc.a for static build
|
||||
#
|
||||
# Without a stable ABI, there's no point in having any of that.
|
||||
# Without a stable API, there's no point in having the *.a file.
|
||||
#
|
||||
# A new ELF soname is required for every big ABI change. To conserve
|
||||
# numbers for future use, the ELF soname can be set equal to the
|
||||
# file name until some future date when a stable ABI is declared.
|
||||
|
||||
SHARED := 1
|
||||
|
||||
# for lib$(NAME).so and /usr/include/($NAME) and such
|
||||
NAME := proc
|
||||
|
||||
LIBVERSION := $(VERSION).$(SUBVERSION).$(MINORVERSION)
|
||||
ABIVERSION := 0
|
||||
|
||||
SOFILE := lib$(NAME)-$(LIBVERSION).so
|
||||
ifneq ($(ABIVERSION),0)
|
||||
SOLINK := lib$(NAME).so
|
||||
SONAME := lib$(NAME).so.$(ABIVERSION)
|
||||
else
|
||||
SONAME := $(SOFILE)
|
||||
SOLINK := $(SOFILE)
|
||||
endif
|
||||
|
||||
ANAME := lib$(NAME).a
|
||||
|
||||
############
|
||||
|
||||
FPIC := -fpic
|
||||
|
||||
ifeq ($(SHARED),1)
|
||||
ALL += proc/$(SONAME)
|
||||
INSTALL += ldconfig
|
||||
LIBFLAGS := -DSHARED=1 $(FPIC)
|
||||
# This is in gcc 3.5, but exported functions must be marked.
|
||||
#LIBFLAGS += $(call check_gcc,-fvisibility=hidden,)
|
||||
LIBPROC := proc/$(SONAME)
|
||||
else
|
||||
ALL += proc/$(ANAME)
|
||||
#INSTALL += $(usr/lib)$(ANAME)
|
||||
LIBFLAGS := -DSHARED=0
|
||||
LIBPROC := proc/$(ANAME)
|
||||
endif
|
||||
|
||||
LIBSRC := $(wildcard proc/*.c)
|
||||
LIBHDR := $(wildcard proc/*.h)
|
||||
LIBOBJ := $(LIBSRC:.c=.o)
|
||||
|
||||
# Separate rule for this directory, to use -fpic or -fPIC
|
||||
$(filter-out proc/version.o,$(LIBOBJ)): proc/%.o: proc/%.c
|
||||
$(CC) -c $(ALL_CPPFLAGS) $(ALL_CFLAGS) $(LIBFLAGS) $< -o $@
|
||||
|
||||
LIB_X := COPYING module.mk library.map
|
||||
TARFILES += $(LIBSRC) $(LIBHDR) $(addprefix proc/,$(LIB_X))
|
||||
|
||||
|
||||
# Clean away all output files, .depend, and symlinks.
|
||||
# Use wildcards in case the version has changed.
|
||||
CLEAN += proc/.depend proc/lib*.so* proc/lib*.a $(LIBOBJ)
|
||||
DIRS += proc/
|
||||
|
||||
proc/$(ANAME): $(LIBOBJ)
|
||||
$(AR) rcs $@ $^
|
||||
|
||||
#proc/$(SONAME): proc/library.map
|
||||
proc/$(SONAME): $(LIBOBJ)
|
||||
$(CC) $(ALL_CFLAGS) $(ALL_LDFLAGS) -shared -Wl,-soname,$(SONAME) -Wl,--version-script=proc/library.map -o $@ $^ -lc
|
||||
|
||||
|
||||
# AUTOMATIC DEPENDENCY GENERATION -- GCC AND GNUMAKE DEPENDENT
|
||||
proc/.depend: $(LIBSRC) $(LIBHDR)
|
||||
$(strip $(CC) $(ALL_CPPFLAGS) $(LIB_CFLAGS) -MM -MG $(LIBSRC) > $@)
|
||||
|
||||
ifneq ($(MAKECMDGOALS),clean)
|
||||
ifneq ($(MAKECMDGOALS),tar)
|
||||
ifneq ($(MAKECMDGOALS),extratar)
|
||||
ifneq ($(MAKECMDGOALS),beta)
|
||||
-include proc/.depend
|
||||
endif
|
||||
endif
|
||||
endif
|
||||
endif
|
||||
|
||||
#################### install rules ###########################
|
||||
|
||||
$(lib)$(SOFILE) : proc/$(SONAME)
|
||||
$(install) --mode a=rx $< $@
|
||||
|
||||
ifneq ($(SOLINK),$(SOFILE))
|
||||
.PHONY: $(lib)$(SOLINK)
|
||||
$(lib)$(SOLINK) : $(lib)$(SOFILE)
|
||||
cd $(lib) && $(ln_sf) $(SOFILE) $(SOLINK)
|
||||
endif
|
||||
|
||||
ifneq ($(SONAME),$(SOFILE))
|
||||
.PHONY: $(lib)$(SONAME)
|
||||
$(lib)$(SONAME) : $(lib)$(SOFILE)
|
||||
cd $(lib) && $(ln_sf) $(SOFILE) $(SONAME)
|
||||
endif
|
||||
|
||||
.PHONY: ldconfig
|
||||
ldconfig : $(lib)$(SONAME) $(lib)$(SOLINK)
|
||||
$(ldconfig)
|
||||
|
||||
$(usr/lib)$(ANAME) : proc/$(ANAME)
|
||||
$(install) --mode a=r $< $@
|
||||
|
||||
# Junk anyway... supposed to go in /usr/include/$(NAME)
|
||||
#INSTALL += $(addprefix $(include),$(HDRFILES))
|
||||
#
|
||||
#$(addprefix $(include),$(HDRFILES)): $(include)% : proc/%
|
||||
#$(include)% : proc/%
|
||||
# $(install) --mode a=r $< $@
|
||||
|
||||
##################################################################
|
||||
|
||||
proc/version.o: proc/version.c proc/version.h
|
||||
$(CC) $(ALL_CPPFLAGS) $(ALL_CFLAGS) $(LIBFLAGS) -DVERSION=\"$(VERSION)\" -DSUBVERSION=\"$(SUBVERSION)\" -DMINORVERSION=\"$(MINORVERSION)\" -c -o $@ $<
|
||||
@ -78,7 +78,7 @@
|
||||
#define STRINGIFY_ARG(a) #a
|
||||
#define STRINGIFY(a) STRINGIFY_ARG(a)
|
||||
|
||||
// marks old junk, to warn non-procps library users
|
||||
// marks old junk, to warn non-procps-ng library users
|
||||
#if ( __GNUC__ == 3 && __GNUC_MINOR__ > 0 ) || __GNUC__ > 3
|
||||
#define OBSOLETE __attribute__((deprecated))
|
||||
#else
|
||||
|
||||
@ -6,9 +6,7 @@
|
||||
* May be distributed under the conditions of the
|
||||
* GNU Library General Public License; a copy is in COPYING
|
||||
*/
|
||||
#ifdef HAVE_CONFIG_H
|
||||
#include "config.h"
|
||||
#endif
|
||||
|
||||
#include "version.h"
|
||||
#include "readproc.h"
|
||||
#include "alloc.h"
|
||||
|
||||
@ -221,7 +221,7 @@ static void old_Hertz_hack(void){
|
||||
|
||||
#define NOTE_NOT_FOUND 42
|
||||
|
||||
//extern char** environ;
|
||||
extern char** environ;
|
||||
|
||||
/* for ELF executables, notes are pushed before environment and args */
|
||||
static unsigned long find_elf_note(unsigned long findme){
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
/* Suite version information for procps utilities
|
||||
/* Suite version information for procps-ng utilities
|
||||
* Copyright (c) 1995 Martin Schulze <joey@infodrom.north.de>
|
||||
* Ammended by cblake to only export the function symbol.
|
||||
*
|
||||
@ -7,24 +7,18 @@
|
||||
* Redistributable under the terms of the
|
||||
* GNU Library General Public License; see COPYING
|
||||
*/
|
||||
#ifdef HAVE_CONFIG_H
|
||||
#include <config.h>
|
||||
#endif
|
||||
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
#include "version.h"
|
||||
|
||||
#ifdef MINORVERSION
|
||||
const char procps_version[] = "procps version " VERSION "." SUBVERSION "." MINORVERSION;
|
||||
#else
|
||||
const char procps_version[] = "procps version " VERSION "." SUBVERSION;
|
||||
#endif
|
||||
const char procps_version[] = PACKAGE_NAME " version " PACKAGE_VERSION;
|
||||
|
||||
void display_version(void) {
|
||||
fprintf(stdout, "%s\n", procps_version);
|
||||
}
|
||||
|
||||
/* Linux kernel version information for procps utilities
|
||||
/* Linux kernel version information for procps-ng utilities
|
||||
* Copyright (c) 1996 Charles Blake <cblake@bbn.com>
|
||||
*/
|
||||
#include <sys/utsname.h>
|
||||
|
||||
@ -3,9 +3,9 @@
|
||||
|
||||
#include "procps.h"
|
||||
|
||||
/* Suite version information for procps utilities
|
||||
/* Suite version information for procps-ng utilities
|
||||
* Copyright (c) 1995 Martin Schulze <joey@infodrom.north.de>
|
||||
* Linux kernel version information for procps utilities
|
||||
* Linux kernel version information for procps-ng utilities
|
||||
* Copyright (c) 1996 Charles Blake <cblake@bbn.com>
|
||||
* Distributable under the terms of the GNU Library General Public License
|
||||
*
|
||||
|
||||
Reference in New Issue
Block a user