diff options
| author | giraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8> | 2014-04-13 20:01:18 +0000 |
|---|---|---|
| committer | giraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8> | 2014-04-13 20:01:18 +0000 |
| commit | cb0bf68aa475ddb96b0ecc3ac3676ad9f5598b59 (patch) | |
| tree | a55bb883fb941ff7a483bcb76138d70b2149822b /common.mk | |
| parent | 24d2e20391c5949c20bc419ab9e4974541011294 (diff) | |
| download | netpbm-mirror-cb0bf68aa475ddb96b0ecc3ac3676ad9f5598b59.tar.gz netpbm-mirror-cb0bf68aa475ddb96b0ecc3ac3676ad9f5598b59.tar.xz netpbm-mirror-cb0bf68aa475ddb96b0ecc3ac3676ad9f5598b59.zip | |
Add Windows icon capability, centralize make rule for link of programs
git-svn-id: http://svn.code.sf.net/p/netpbm/code/trunk@2182 9d0c8265-081b-0410-96cb-a4ca84ce46f8
Diffstat (limited to 'common.mk')
| -rw-r--r-- | common.mk | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/common.mk b/common.mk index 51fbc438..54a1484c 100644 --- a/common.mk +++ b/common.mk @@ -287,6 +287,10 @@ $(BUNDLED_URTLIB): $(BUILDDIR)/urt SRCDIR=$(SRCDIR) BUILDDIR=$(BUILDDIR) $(notdir $@) endif +$(BUILDDIR)/icon/netpbm.o: $(BUILDDIR)/icon + $(MAKE) -C $(dir $@) -f $(SRCDIR)/icon/Makefile \ + SRCDIR=$(SRCDIR) BUILDDIR=$(BUILDDIR) $(notdir $@) + # Here are some notes from Nelson H. F. Beebe on April 16, 2002: # # There are at least three incompatible kinds of command-line options @@ -371,11 +375,12 @@ MATHLIB ?= -lm # Note that LDFLAGS might contain -L options, so order is important. # LDFLAGS is commonly set as an environment variable. -LDFLAGS_ALL = $(shell $(LIBOPT) $(NETPBMLIB)) \ - $(LDFLAGS) $(LDLIBS) $(MATHLIB) $(RPATH) $(LADD) +LDFLAGS_ALL = $(shell $(LIBOPT) $(NETPBMLIB)) $(WINICON_OBJECT) \ + $(LDFLAGS_TARGET) $(LDFLAGS) $(LDLIBS) $(MATHLIB) $(RPATH) $(LADD) -$(PORTBINARIES) $(MATHBINARIES): %: %.o $(NETPBMLIB) $(LIBOPT) - $(LD) -o $@ $@.o $(LDFLAGS_ALL) +$(PORTBINARIES) $(MATHBINARIES): %: %.o \ + $(NETPBMLIB) $(LIBOPT) $(WINICON_OBJECT) + $(LD) -o $@ $@.o $(ADDL_OBJECTS) $(LDFLAGS_ALL) # MERGE STUFF |