# HG changeset patch # User tron # Date 1162915134 0 # Node ID 0ea8270d080bfe5f5a644a7b502c9c53b2358323 # Parent b928a1036b2260dfe56d932afcd408c1a2dd22f1 (svn r7101) Evaluate the necessary flags for libpng once per make run, not every time the CFLAGS/LIBS variables are used diff -r b928a1036b22 -r 0ea8270d080b Makefile --- a/Makefile Tue Nov 07 15:53:20 2006 +0000 +++ b/Makefile Tue Nov 07 15:58:54 2006 +0000 @@ -469,20 +469,22 @@ # libpng config ifdef WITH_PNG CDEFS += -DWITH_PNG -CFLAGS += $(shell $(LIBPNG_CONFIG) --cppflags --I_opts) +CCFLAGS_PNG := $(shell $(LIBPNG_CONFIG) --cppflags --I_opts) +CFLAGS += $(CCFLAGS_PNG) # seems like older libpng versions are broken and need this PNGCONFIG_FLAGS = --ldflags --libs ifdef STATIC ifdef OSX # Seems like we need a tiny hack for OSX static to work -LIBS += $(shell $(LIBPNG_CONFIG) --prefix)/lib/libpng.a +LDFLAGS_PNG := $(shell $(LIBPNG_CONFIG) --prefix)/lib/libpng.a else -LIBS += $(shell $(LIBPNG_CONFIG) --static $(PNGCONFIG_FLAGS)) +LDFLAGS_PNG := $(shell $(LIBPNG_CONFIG) --static $(PNGCONFIG_FLAGS)) endif else -LIBS += $(shell $(LIBPNG_CONFIG) --L_opts $(PNGCONFIG_FLAGS)) +LDFLAGS_PNG := $(shell $(LIBPNG_CONFIG) --L_opts $(PNGCONFIG_FLAGS)) endif +LIBS += $(LDFLAGS_PNG) endif # use std C++ lib: