Restore lost wake_up().

Sun May  8 15:45:08 2005  Søren Sandmann  <sandmann@redhat.com>

	* sysprof-module.c (do_generate): Restore lost wake_up().

	* sfile.c: Comment out use of bz2.

	* Makefile: Add an install target. Add GLADE_DIR and PIXMAP_DIR

	* sysprof.c (build_gui): use GLADE_DIR and PIXMAP_DIR here.

	* TODO: Updates.
This commit is contained in:
Søren Sandmann
2005-05-08 19:49:26 +00:00
committed by Søren Sandmann Pedersen
parent c427b88352
commit aaa38daad8
9 changed files with 102 additions and 33 deletions

View File

@ -5,8 +5,16 @@ CFLAGS += $(MODCFLAGS) -DKERNEL26
else
CFLAGS := $(shell pkg-config --cflags gtk+-2.0 libglade-2.0) -Wall -g
LIBS := $(shell pkg-config --libs gtk+-2.0 libglade-2.0) -lbfd -liberty -lbz2
ifeq ($(PREFIX),)
PREFIX := /usr/local
endif
BINDIR := $(PREFIX)/bin
GLADE_DIR := $(PREFIX)/share/sysprof
PIXMAP_DIR := $(PREFIX)/share/pixmaps/sysprof
CFLAGS := $(shell pkg-config --cflags gtk+-2.0 libglade-2.0) -Wall -g -DGLADE_DIR=\"$(GLADE_DIR)\" -DPIXMAP_DIR=\"$(PIXMAP_DIR)\"
LIBS := $(shell pkg-config --libs gtk+-2.0 libglade-2.0) -lbfd -liberty
C_FILES := sysprof.c binfile.c stackstash.c watch.c process.c \
profile.c treeviewutils.c sfile.c
OBJS := $(addsuffix .o, $(basename $(C_FILES)))
@ -17,12 +25,26 @@ INCLUDE := -isystem $(KDIR)/include
MODCFLAGS := -DMODULE -D__KERNEL__ -Wall ${INCLUDE}
MODULE := sysprof-module
all: check $(BINARY) $(MODULE).o
KMAKE := $(MAKE) -C $(KDIR) SUBDIRS=$(PWD)
all: binaries
@echo ==========================================
@echo
@echo To install sysprof type
@echo
@echo \ \ \ make PREFIX=\<prefix\> install
@echo
@echo as root. For example:
@echo
@echo \ \ \ make PREFIX=/usr install
@echo
binaries: check $(BINARY) $(MODULE).o
check:
pkg-config gtk+-2.0 libglade-2.0
@[ -r $(KDIR)/include/linux/kernel.h ] || (echo No kernel headers found; exit 1)
@[ -r /usr/include/bzlib.h ] || (echo bzip2 header file not found; exit 1)
# @[ -r /usr/include/bzlib.h ] || (echo bzip2 header file not found; exit 1)
touch check
$(BINARY): $(OBJS) depend
@ -33,6 +55,41 @@ clean:
depend:
$(CC) -MM $(CFLAGS) $(C_FILES) > depend.mk
install: binaries
@echo
@echo Installing in $(PREFIX)
@echo
# binary
@mkdir -p $(BINDIR)
cp sysprof $(BINDIR)
# glade file
mkdir -p $(GLADE_DIR)
cp sysprof.glade $(GLADE_DIR)
# icon
mkdir -p $(PIXMAP_DIR)
cp sysprof-icon.png $(PIXMAP_DIR)
# kernel module
$(KMAKE) modules_install
depmod
@echo ======================================
@echo
@echo To run sysprof first insert the module by typing
@echo
@echo \ \ \ \ modprobe sysprof-module
@echo
@echo as root. Then run \"$(PREFIX)/bin/sysprof\".
@echo
insert_module: install
modprobe -r sysprof-module
modprobe sysprof-module
depend.mk:
touch depend.mk
$(MAKE) depend
@ -41,20 +98,13 @@ include depend.mk
.PHONY: depend all
ifeq ($(shell (uname -r | grep 2.6) > /dev/null ; echo -n $$?),0)
ifneq ($(shell (uname -r | grep 2.6) > /dev/null ; echo -n $$?),0)
echo A 2.6 kernel is required; exit 1
endif
# if kernel 2.6
$(MODULE).o: $(MODULE).c
# echo modcflags $(MODCFLAGS)
$(MAKE) -C $(KDIR) SUBDIRS=$(PWD) modules
else
MODCFLAGS += -DKERNEL24
# build module
$(MODULE).o: $(MODULE).c
$(CC) $(MODCFLAGS) $(MODULE).c -c -o$(MODULE).o
$(KMAKE) modules
endif
endif