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
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
|
--- Makefile.common.orig Sat May 6 19:03:55 2000
+++ Makefile.common Mon May 8 00:00:00 2000
@@ -56,9 +56,9 @@
# directories in which to resolve inclusions by C files.
# Rule for objects.
-$(OBJECTS): %.o: %.c
+$(OBJECTS) $(LIBOBJECTS): %.o: %.c
$(CC) -c $(CFLAGS) $(INCLUDE) -o $@ $<
-$(LIBOBJECTS): %.o: %.c
+$(LIBSOBJECTS): %.so: %.c
$(CC) -c $(CFLAGS) $(CFLAGS_SHLIB) $(INCLUDE) -o $@ $<
$(MERGE_OBJECTS): %.o2: %.c
@@ -68,7 +68,7 @@
$(CC) $(CFLAGS) -Wno-implicit -c -o $@ $<
$(MERGENAME): $(MERGENAME).o $(MERGE_OBJECTS) $(NETPBMLIBS)
- $(LD) $(LDFLAGS) -o $@ $< $(MERGE_OBJECTS) -lm $(NETPBMLIBS)
+ $(LD) $(LDFLAGS) -o $@ $< $(MERGE_OBJECTS) -lm $(NETPBMLD)
# Before Netpbm 8.4, we did hard links instead of symbolic. A user
# requested symbolic, and I couldn't see a reason for hard (original reason
@@ -77,27 +77,26 @@
install.merge: $(MERGENAME) $(NOMERGEBINARIES) install.script
cd $(INSTALLBINARIES) ; rm -f $(BINARIES) $(MERGE_ALIASES)
ifneq ($(MERGENAME)x,x)
- $(INSTALL) -s -m$(INSTALL_PERM_BIN) $(MERGENAME) $(INSTALLBINARIES)
+ ${BSD_INSTALL_PROGRAM} $(MERGENAME) $(INSTALLBINARIES)
cd $(INSTALLBINARIES) ; \
for i in $(BINARIES) $(MERGE_ALIASES) ; \
- do ln -s $(MERGENAME)$(EXE) $$i ; \
+ do ln -sf $(MERGENAME)$(EXE) $$i ; \
done
endif
ifneq ($(NOMERGEBINARIES)x,x)
- $(INSTALL) -s -m$(INSTALL_PERM_BIN) \
- $(NOMERGEBINARIES) $(INSTALLBINARIES)
+ ${BSD_INSTALL_PROGRAM} $(NOMERGEBINARIES) $(INSTALLBINARIES)
endif
.PHONY: install.bin.common
install.bin.common: $(BINARIES) install.script
# Note that on Cygwin, the executables are actually pbmmake.exe, etc.
# Make and Install know that pbmmake.exe counts as pbmmake.
- $(INSTALL) -s -m$(INSTALL_PERM_BIN) $(BINARIES) $(INSTALLBINARIES)
+ ${BSD_INSTALL_PROGRAM} $(BINARIES) $(INSTALLBINARIES)
.PHONY: install.script
install.script: $(SCRIPTS)
ifneq ($(SCRIPTS)x,x)
- $(INSTALL) -m$(INSTALL_PERM_BIN) $(SCRIPTS) $(INSTALLSCRIPTS)
+ ${BSD_INSTALL_SCRIPT} $(SCRIPTS) $(INSTALLSCRIPTS)
endif
.PHONY: install.man
@@ -127,43 +126,28 @@
# compile programs that use the Netpbm libraries. Alternatively, you may
# prefer not to "install" them, but just to access the Netpbm source
# directory when you compile your programs.
- $(INSTALL) -m$(INSTALL_PERM_HDR) \
- $(INTERFACE_HEADERS) $(INSTALLHDRS)
+ ${BSD_INSTALL_DATA} $(INTERFACE_HEADERS) $(INSTALLHDRS)
# The libxxx.so link is needed to link the executables.
-lib$(LIBROOT).so: lib$(LIBROOT).so.$(MAJ)
+lib$(LIBROOT).so: lib$(LIBROOT).so.$(MAJ) lib$(LIBROOT).a
rm -f $@
- ln -s $< $@
-# The libxxx.so.MAJ link is only needed to test the programs without
-# installing the libraries (in that case, you also need to direct the
-# dynamic linker to the source directories, e.g. set LD_LIBRARY_PATH).
-lib$(LIBROOT).so.$(MAJ): lib$(LIBROOT).so.$(MAJ).$(MIN)
- rm -f $@
- ln -s $< $@
-lib$(LIBROOT).so.$(MAJ).$(MIN): $(LIBOBJECTS) $(LIBOBJECTS_X) $(LIBLIBS)
- $(LD) $(LDSHLIB) -Wl,-soname,lib$(LIBROOT).so.$(MAJ) -o $@ \
- $(LIBOBJECTS) $(LIBOBJECTS_X) $(LIBLIBS) -lc
+ ln -sf $< $@
+lib$(LIBROOT).so.$(MAJ): $(LIBSOBJECTS) $(LIBLIBS)
+ $(LD) $(LDSHLIB) -Wl,-soname,$@ -o $@ $(LIBSOBJECTS)
# Static library. Unused by default, but with a small change to make files...
-lib$(LIBROOT).a: $(LIBOBJECTS) $(LIBOBJECTS_X)
+lib$(LIBROOT).a: $(LIBOBJECTS)
-rm -f $@
- ar rc $@ $(LIBOBJECTS) $(LIBOBJECTS_X)
+ ar rc $@ $(LIBOBJECTS)
-ranlib $@
.PHONY: install.lib.common
-ifeq ($(NETPBMLIBSUFFIX),so)
-# install a shared library
-install.lib.common: lib$(LIBROOT).so.$(MAJ).$(MIN)
- cd $(INSTALLLIBS) ; rm -f lib$(LIBROOT).so.$(MAJ).*
- $(INSTALL) -m$(INSTALL_PERM_LIBD) $< $(INSTALLLIBS)
- cd $(INSTALLLIBS) ; rm -f lib$(LIBROOT).so; ln -s $< lib$(LIBROOT).so
- cd $(INSTALLLIBS) ; rm -f; ln -s $< lib$(LIBROOT).so.$(MAJ)
-else
-# install a static library
-install.lib.common: lib$(LIBROOT).a
- $(INSTALL) -m$(INSTALL_PERM_LIBS) $< $(INSTALLLIBS)/$<
-endif
+install.lib.common: lib$(LIBROOT).so lib$(LIBROOT).a
+ cd $(INSTALLLIBS) ; rm -f lib$(LIBROOT).*
+ ${BSD_INSTALL_DATA} lib$(LIBROOT).a $(INSTALLLIBS)
+ ${BSD_INSTALL_DATA} lib$(LIBROOT).so.$(MAJ) $(INSTALLLIBS)
+ ln -sf lib$(LIBROOT).so.$(MAJ) $(INSTALLLIBS)/lib$(LIBROOT).so
.PHONY: dep
dep Makefile.depend:
|
