2000-05-19 08:34:13 +00:00
|
|
|
--- 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 @@
|
2000-04-08 06:12:34 +00:00
|
|
|
$(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
|
2000-05-19 08:34:13 +00:00
|
|
|
@@ -77,27 +77,26 @@
|
2000-04-01 23:57:38 +00:00
|
|
|
install.merge: $(MERGENAME) $(NOMERGEBINARIES) install.script
|
2000-05-19 08:34:13 +00:00
|
|
|
cd $(INSTALLBINARIES) ; rm -f $(BINARIES) $(MERGE_ALIASES)
|
2000-04-07 21:54:04 +00:00
|
|
|
ifneq ($(MERGENAME)x,x)
|
2000-05-19 08:34:13 +00:00
|
|
|
- $(INSTALL) -s -m$(INSTALL_PERM_BIN) $(MERGENAME) $(INSTALLBINARIES)
|
2000-04-01 23:57:38 +00:00
|
|
|
+ ${BSD_INSTALL_PROGRAM} $(MERGENAME) $(INSTALLBINARIES)
|
|
|
|
cd $(INSTALLBINARIES) ; \
|
2000-04-07 21:54:04 +00:00
|
|
|
for i in $(BINARIES) $(MERGE_ALIASES) ; \
|
2000-05-19 08:34:13 +00:00
|
|
|
- do ln -s $(MERGENAME)$(EXE) $$i ; \
|
|
|
|
+ do ln -sf $(MERGENAME)$(EXE) $$i ; \
|
2000-04-07 21:54:04 +00:00
|
|
|
done
|
|
|
|
endif
|
|
|
|
ifneq ($(NOMERGEBINARIES)x,x)
|
2000-05-19 08:34:13 +00:00
|
|
|
- $(INSTALL) -s -m$(INSTALL_PERM_BIN) \
|
|
|
|
- $(NOMERGEBINARIES) $(INSTALLBINARIES)
|
2000-04-01 23:57:38 +00:00
|
|
|
+ ${BSD_INSTALL_PROGRAM} $(NOMERGEBINARIES) $(INSTALLBINARIES)
|
2000-04-07 21:54:04 +00:00
|
|
|
endif
|
2000-04-01 23:57:38 +00:00
|
|
|
|
|
|
|
.PHONY: install.bin.common
|
|
|
|
install.bin.common: $(BINARIES) install.script
|
2000-05-19 08:34:13 +00:00
|
|
|
# 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)
|
2000-04-01 23:57:38 +00:00
|
|
|
+ ${BSD_INSTALL_PROGRAM} $(BINARIES) $(INSTALLBINARIES)
|
|
|
|
|
|
|
|
.PHONY: install.script
|
|
|
|
install.script: $(SCRIPTS)
|
|
|
|
ifneq ($(SCRIPTS)x,x)
|
2000-05-19 08:34:13 +00:00
|
|
|
- $(INSTALL) -m$(INSTALL_PERM_BIN) $(SCRIPTS) $(INSTALLSCRIPTS)
|
2000-04-01 23:57:38 +00:00
|
|
|
+ ${BSD_INSTALL_SCRIPT} $(SCRIPTS) $(INSTALLSCRIPTS)
|
|
|
|
endif
|
|
|
|
|
|
|
|
.PHONY: install.man
|
2000-05-19 08:34:13 +00:00
|
|
|
@@ -127,43 +126,28 @@
|
|
|
|
# compile programs that use the Netpbm libraries. Alternatively, you may
|
2000-04-01 23:57:38 +00:00
|
|
|
# prefer not to "install" them, but just to access the Netpbm source
|
|
|
|
# directory when you compile your programs.
|
2000-05-19 08:34:13 +00:00
|
|
|
- $(INSTALL) -m$(INSTALL_PERM_HDR) \
|
|
|
|
- $(INTERFACE_HEADERS) $(INSTALLHDRS)
|
2000-04-01 23:57:38 +00:00
|
|
|
+ ${BSD_INSTALL_DATA} $(INTERFACE_HEADERS) $(INSTALLHDRS)
|
|
|
|
|
2000-05-19 08:34:13 +00:00
|
|
|
# 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)
|
2000-04-08 06:12:34 +00:00
|
|
|
- $(LD) $(LDSHLIB) -Wl,-soname,lib$(LIBROOT).so.$(MAJ) -o $@ \
|
2000-05-19 08:34:13 +00:00
|
|
|
- $(LIBOBJECTS) $(LIBOBJECTS_X) $(LIBLIBS) -lc
|
|
|
|
+ ln -sf $< $@
|
|
|
|
+lib$(LIBROOT).so.$(MAJ): $(LIBSOBJECTS) $(LIBLIBS)
|
|
|
|
+ $(LD) $(LDSHLIB) -Wl,-soname,$@ -o $@ $(LIBSOBJECTS)
|
2000-04-01 23:57:38 +00:00
|
|
|
|
2000-05-19 08:34:13 +00:00
|
|
|
# Static library. Unused by default, but with a small change to make files...
|
|
|
|
-lib$(LIBROOT).a: $(LIBOBJECTS) $(LIBOBJECTS_X)
|
|
|
|
+lib$(LIBROOT).a: $(LIBOBJECTS)
|
2000-04-01 23:57:38 +00:00
|
|
|
-rm -f $@
|
2000-05-19 08:34:13 +00:00
|
|
|
- ar rc $@ $(LIBOBJECTS) $(LIBOBJECTS_X)
|
|
|
|
+ ar rc $@ $(LIBOBJECTS)
|
|
|
|
-ranlib $@
|
2000-04-07 21:54:04 +00:00
|
|
|
|
2000-04-01 23:57:38 +00:00
|
|
|
|
2000-04-07 21:54:04 +00:00
|
|
|
.PHONY: install.lib.common
|
2000-05-19 08:34:13 +00:00
|
|
|
-ifeq ($(NETPBMLIBSUFFIX),so)
|
|
|
|
-# install a shared library
|
2000-04-07 21:54:04 +00:00
|
|
|
-install.lib.common: lib$(LIBROOT).so.$(MAJ).$(MIN)
|
2000-04-01 23:57:38 +00:00
|
|
|
- cd $(INSTALLLIBS) ; rm -f lib$(LIBROOT).so.$(MAJ).*
|
2000-05-19 08:34:13 +00:00
|
|
|
- $(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
|
2000-04-01 23:57:38 +00:00
|
|
|
+ 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:
|