Annotation of /trunk/netpbm/patches/netpbm-10.37-build.patch
Parent Directory | Revision Log
Revision 224 -
(hide annotations)
(download)
Sat Jun 23 13:53:28 2007 UTC (17 years, 3 months ago) by niro
File size: 1629 byte(s)
Sat Jun 23 13:53:28 2007 UTC (17 years, 3 months ago) by niro
File size: 1629 byte(s)
-new fixes
1 | niro | 224 | - Don't install libnetpbm.a and libnetpbm.so into a sep link dir |
2 | - Try to fix parallel building | ||
3 | - Make the libopt tool less 'helpful' | ||
4 | |||
5 | --- lib/Makefile | ||
6 | +++ lib/Makefile | ||
7 | @@ -249,7 +249,7 @@ | ||
8 | .PHONY: install.staticlib | ||
9 | install.staticlib: $(PKGDIR)/link | ||
10 | $(INSTALL) -c -m $(INSTALL_PERM_LIBS) libnetpbm.$(STATICLIBSUFFIX) \ | ||
11 | - $(PKGDIR)/link | ||
12 | + $(PKGDIR)/lib | ||
13 | |||
14 | # Install a shared library stub -- the ".so" file used at link time to | ||
15 | # prepare a program for dynamically linking a library at run time | ||
16 | @@ -257,9 +257,9 @@ | ||
17 | install.sharedlibstub: $(PKGDIR)/link | ||
18 | ifeq ($(NETPBMLIBTYPE),unixshared) | ||
19 | # install the link-time (.so) links to the runtime libraries | ||
20 | - cd $(PKGDIR)/link ; \ | ||
21 | + cd $(PKGDIR)/lib ; \ | ||
22 | rm -f libnetpbm.$(NETPBMLIBSUFFIX); \ | ||
23 | - $(SYMLINK) ../lib/libnetpbm.$(NETPBMLIBSUFFIX).$(MAJ) \ | ||
24 | + $(SYMLINK) libnetpbm.$(NETPBMLIBSUFFIX).$(MAJ) \ | ||
25 | libnetpbm.$(NETPBMLIBSUFFIX) | ||
26 | endif | ||
27 | ifeq ($(NETPBMLIBTYPE),dll) | ||
28 | --- GNUmakefile | ||
29 | +++ GNUmakefile | ||
30 | @@ -87,6 +87,9 @@ | ||
31 | |||
32 | .PHONY: nonmerge | ||
33 | nonmerge: $(PRODUCT_SUBDIRS:%=%/all) | ||
34 | + | ||
35 | +$(PRODUCT_SUBDIRS:%=%/all): buildtools/all | ||
36 | +converter/all analyzer/all editor/all generator/all other/all: lib/all | ||
37 | |||
38 | OMIT_CONFIG_RULE = 1 | ||
39 | include $(SRCDIR)/Makefile.common | ||
40 | --- buildtools/libopt.c | ||
41 | +++ buildtools/libopt.c | ||
42 | @@ -502,7 +502,7 @@ | ||
43 | |||
44 | strcpy(outputLine, ""); /* initial value */ | ||
45 | runtime = FALSE; /* initial value */ | ||
46 | - quiet = FALSE; /* initial value */ | ||
47 | + quiet = TRUE; /* initial value */ | ||
48 | error = FALSE; /* no error yet */ | ||
49 | for (arg = 1; arg < argc && !error; arg++) { | ||
50 | if (strcmp(argv[arg], "-runtime") == 0) |