equal
deleted
inserted
replaced
26 # Except as contained in this notice, the name of a copyright holder |
26 # Except as contained in this notice, the name of a copyright holder |
27 # shall not be used in advertising or otherwise to promote the sale, use |
27 # shall not be used in advertising or otherwise to promote the sale, use |
28 # or other dealings in this Software without prior written authorization |
28 # or other dealings in this Software without prior written authorization |
29 # of the copyright holder. |
29 # of the copyright holder. |
30 # |
30 # |
31 # @(#)Makefile.inc 1.93 08/09/15 |
31 # @(#)Makefile.inc 1.94 08/10/06 |
32 # |
32 # |
33 |
33 |
34 ### Default rules |
34 ### Default rules |
35 |
35 |
36 # Which compiler to use to build module |
36 # Which compiler to use to build module |
304 -I$(PROTODIR)$(X11_INCLUDES_DIR) \ |
304 -I$(PROTODIR)$(X11_INCLUDES_DIR) \ |
305 -I$(PROTODIR)/usr/include -I$(PROTODIR)/usr/include/freetype2 |
305 -I$(PROTODIR)/usr/include -I$(PROTODIR)/usr/include/freetype2 |
306 $(USE_DEFAULT_CONFIG_LDFLAGS:no=$(POUND_SIGN)) DEFAULT_CONFIG_LDFLAGS= \ |
306 $(USE_DEFAULT_CONFIG_LDFLAGS:no=$(POUND_SIGN)) DEFAULT_CONFIG_LDFLAGS= \ |
307 -L$(PROTODIR)/usr/lib$(ARCHLIBSUBDIR) \ |
307 -L$(PROTODIR)/usr/lib$(ARCHLIBSUBDIR) \ |
308 -L$(PROTODIR)$(X11_DIR)/lib$(ARCHLIBSUBDIR) |
308 -L$(PROTODIR)$(X11_DIR)/lib$(ARCHLIBSUBDIR) |
309 DEFAULT_PKG_CONFIG_PATH=$(PROTODIR)/usr/lib/$(ARCHLIBSUBDIR)/pkgconfig:$(TOP)/common/pc-files/$(BUILD_DIR):/usr/lib$(ARCHLIBSUBDIR)/pkgconfig |
309 |
|
310 DEFAULT_PKG_CONFIG_PATH=$(TOP)/common/pc-files/$(BUILD_DIR):$(PROTODIR)/usr/lib/$(ARCHLIBSUBDIR)/pkgconfig:/usr/lib$(ARCHLIBSUBDIR)/pkgconfig |
310 |
311 |
311 # Set USE_DEFAULT_CONFIG_ENV=no in a Makefile to not use this default |
312 # Set USE_DEFAULT_CONFIG_ENV=no in a Makefile to not use this default |
312 # autoconfig environment |
313 # autoconfig environment |
313 $(USE_DEFAULT_CONFIG_ENV:no=$(POUND_SIGN)) DEFAULT_CONFIG_ENV = \ |
314 $(USE_DEFAULT_CONFIG_ENV:no=$(POUND_SIGN)) DEFAULT_CONFIG_ENV = \ |
314 CC="$(CC)" CXX="$(CXX)" \ |
315 CC="$(CC)" CXX="$(CXX)" \ |