1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
|
- Don't install libnetpbm.a and libnetpbm.so into a sep link dir
- Try to fix parallel building
- Make the libopt tool less 'helpful'
- Remove pointless echo during build
--- lib/Makefile
+++ lib/Makefile
@@ -249,7 +249,7 @@
.PHONY: install.staticlib
install.staticlib: $(PKGDIR)/link
$(INSTALL) -c -m $(INSTALL_PERM_LIBS) libnetpbm.$(STATICLIBSUFFIX) \
- $(PKGDIR)/link
+ $(PKGDIR)/lib
# Install a shared library stub -- the ".so" file used at link time to
# prepare a program for dynamically linking a library at run time
@@ -257,9 +257,9 @@
install.sharedlibstub: $(PKGDIR)/link
ifeq ($(NETPBMLIBTYPE),unixshared)
# install the link-time (.so) links to the runtime libraries
- cd $(PKGDIR)/link ; \
+ cd $(PKGDIR)/lib ; \
rm -f libnetpbm.$(NETPBMLIBSUFFIX); \
- $(SYMLINK) ../lib/libnetpbm.$(NETPBMLIBSUFFIX).$(MAJ) \
+ $(SYMLINK) libnetpbm.$(NETPBMLIBSUFFIX).$(MAJ) \
libnetpbm.$(NETPBMLIBSUFFIX)
endif
ifeq ($(NETPBMLIBTYPE),dll)
--- GNUmakefile
+++ GNUmakefile
@@ -87,6 +87,9 @@
.PHONY: nonmerge
nonmerge: $(PRODUCT_SUBDIRS:%=%/all)
+
+$(PRODUCT_SUBDIRS:%=%/all): buildtools/all
+converter/all analyzer/all editor/all generator/all other/all: lib/all
OMIT_CONFIG_RULE = 1
include $(SRCDIR)/Makefile.common
--- buildtools/libopt.c
+++ buildtools/libopt.c
@@ -496,4 +496,5 @@
main(int argc, char **argv) {
+ bool shut_the_hell_up = TRUE;
bool error;
bool runtime; /* -runtime option has been seen */
@@ -508,4 +509,6 @@
if (strcmp(argv[arg], "-runtime") == 0)
runtime = TRUE;
+ else if (strcmp(argv[arg], "-v") == 0)
+ shut_the_hell_up = FALSE;
else {
if (strlen(argv[arg]) > 200)
@@ -534,4 +537,5 @@
} else {
fputs(outputLine, stdout);
+ if (shut_the_hell_up == FALSE)
fprintf(stderr, "libopt results: '%s'\n", outputLine);
retval = 0;
--- converter/other/jpeg2000/Makefile
+++ converter/other/jpeg2000/Makefile
@@ -57,7 +57,6 @@
include $(SRCDIR)/Makefile.common
$(BINARIES): %: %.o $(JASPERLIB_DEP) $(NETPBMLIB) $(LIBOPT)
- echo deps: $^
$(LD) $(LDFLAGS) $(MATHLIB) $(LDLIBS) -o $@ $< \
`$(LIBOPT) $(NETPBMLIB) $(JASPERLIB_USE)` $(JASPERDEPLIBS) -lm \
$(RPATH) $(LADD)
|
GitWeb
