projects / packages / procps.git / blame
| Commit | Line | Data |
|---|---|---|
| 4c1e89bc AG |
1 | diff -burN procps-3.1.12.orig/Makefile procps-3.1.12/Makefile |
| 2 | --- procps-3.1.12.orig/Makefile 2003-09-15 09:23:49.108280728 +0200 | |
| 3 | +++ procps-3.1.12/Makefile 2003-09-15 09:29:20.682873728 +0200 | |
| 4 | @@ -61,7 +61,8 @@ | |
| 5499af12 AM |
5 | uptime.c tload.c free.c w.c top.c vmstat.c watch.c skill.c \ |
| 6 | sysctl.c pgrep.c top.h pmap.c | |
| 7 | ||
| 8 | -CURSES := -I/usr/include/ncurses -lncurses | |
| 9 | +CURSESINC := -I/usr/include/ncurses | |
| 10 | +CURSESLIB := -lncurses | |
| 11 | ||
| 4c1e89bc AG |
12 | # Preprocessor flags. |
| 13 | PKG_CPPFLAGS := -D_GNU_SOURCE -I proc | |
| 14 | @@ -80,7 +81,8 @@ | |
| 5499af12 AM |
15 | -W -Wall -Wshadow -Wcast-align -Wredundant-decls \ |
| 16 | -Wbad-function-cast -Wcast-qual -Wwrite-strings -Waggregate-return \ | |
| 4c1e89bc AG |
17 | -Wstrict-prototypes -Wmissing-prototypes |
| 18 | -CFLAGS := -O2 -g3 | |
| 19 | +OPT := -O2 | |
| 20 | +CFLAGS := $(OPT) -g3 | |
| 21 | ALL_CFLAGS := $(PKG_CFLAGS) $(CFLAGS) | |
| 22 | ||
| 23 | PKG_LDFLAGS := -Wl,-warn-common | |
| 24 | @@ -163,16 +165,22 @@ | |
| 25 | w.o: w.c | |
| 26 | $(CC) $(ALL_CPPFLAGS) $(ALL_CFLAGS) $(W_SHOWFROM) -c $< | |
| 5499af12 AM |
27 | |
| 28 | +top.o : top.c | |
| 4c1e89bc | 29 | + $(CC) $(ALL_CPPFLAGS) $(ALL_CFLAGS) -c -o $@ $< $(CURSESINC) |
| 5499af12 AM |
30 | + |
| 31 | +watch.o : watch.c | |
| 4c1e89bc | 32 | + $(CC) $(ALL_CPPFLAGS) $(ALL_CFLAGS) -c -o $@ $< $(CURSESINC) |
| 5499af12 | 33 | + |
| 4c1e89bc | 34 | ############ prog.o --> prog |
| 5499af12 | 35 | |
| 4c1e89bc AG |
36 | pmap w uptime tload free sysctl vmstat utmp pgrep skill: % : %.o $(LIBPROC) |
| 37 | $(CC) $(ALL_CFLAGS) $(ALL_LDFLAGS) -o $@ $^ | |
| 5499af12 AM |
38 | |
| 39 | top: % : %.o $(LIBPROC) | |
| 4c1e89bc AG |
40 | - $(CC) $(ALL_CFLAGS) $(ALL_LDFLAGS) -o $@ $^ $(CURSES) |
| 41 | + $(CC) $(ALL_CFLAGS) $(ALL_LDFLAGS) -o $@ $^ $(CURSESLIB) | |
| 5499af12 AM |
42 | |
| 43 | watch: % : %.o | |
| 4c1e89bc AG |
44 | - $(CC) $(ALL_CFLAGS) $(ALL_LDFLAGS) -o $@ $^ $(CURSES) |
| 45 | + $(CC) $(ALL_CFLAGS) $(ALL_LDFLAGS) -o $@ $^ $(CURSESLIB) | |
| 5499af12 AM |
46 | |
| 47 | ############ progX --> progY | |
| 48 | ||
| 4c1e89bc AG |
49 | diff -burN procps-3.1.12.orig/proc/module.mk procps-3.1.12/proc/module.mk |
| 50 | --- procps-3.1.12.orig/proc/module.mk 2003-09-15 09:23:49.104281336 +0200 | |
| 51 | +++ procps-3.1.12/proc/module.mk 2003-09-15 09:29:57.364297304 +0200 | |
| 52 | @@ -63,7 +63,7 @@ | |
| 5499af12 AM |
53 | $(lib)/$(SONAME) : proc/$(SONAME) |
| 54 | $(install) --mode a=rx --strip $< $@ | |
| 55 | cd $(lib) && $(ln_sf) $(SONAME) lib$(NAME).so | |
| 56 | - $(ldconfig) | |
| 57 | + -$(ldconfig) | |
| 58 | ||
| 59 | #$(usr/lib)/lib$(NAME).a : proc/lib$(NAME).a | |
| 60 | # $(install) --mode a=r --strip $< $@ |