equal
deleted
inserted
replaced
315 $(LIBJAVA_HEADER_FLAGS) |
315 $(LIBJAVA_HEADER_FLAGS) |
316 # |
316 # |
317 |
317 |
318 LIBAWT_XAWT_CFLAGS += -DXAWT -DXAWT_HACK \ |
318 LIBAWT_XAWT_CFLAGS += -DXAWT -DXAWT_HACK \ |
319 -DPACKAGE_PATH=\"$(PACKAGE_PATH)\" \ |
319 -DPACKAGE_PATH=\"$(PACKAGE_PATH)\" \ |
|
320 $(FONTCONFIG_CFLAGS) \ |
320 $(CUPS_CFLAGS) |
321 $(CUPS_CFLAGS) |
321 |
322 |
322 ifeq ($(OPENJDK_TARGET_OS), solaris) |
323 ifeq ($(OPENJDK_TARGET_OS), solaris) |
323 LIBAWT_XAWT_CFLAGS += -DFUNCPROTO=15 |
324 LIBAWT_XAWT_CFLAGS += -DFUNCPROTO=15 |
324 endif |
325 endif |
553 OPTIMIZATION := LOW, \ |
554 OPTIMIZATION := LOW, \ |
554 CFLAGS := $(CFLAGS_JDKLIB) \ |
555 CFLAGS := $(CFLAGS_JDKLIB) \ |
555 -DHEADLESS=true \ |
556 -DHEADLESS=true \ |
556 -DPACKAGE_PATH=\"$(PACKAGE_PATH)\" \ |
557 -DPACKAGE_PATH=\"$(PACKAGE_PATH)\" \ |
557 $(CUPS_CFLAGS) \ |
558 $(CUPS_CFLAGS) \ |
|
559 $(FONTCONFIG_CFLAGS) \ |
558 $(X_CFLAGS) \ |
560 $(X_CFLAGS) \ |
559 $(LIBAWT_HEADLESS_CFLAGS), \ |
561 $(LIBAWT_HEADLESS_CFLAGS), \ |
560 DISABLED_WARNINGS_xlc := 1506-356, \ |
562 DISABLED_WARNINGS_xlc := 1506-356, \ |
561 DISABLED_WARNINGS_solstudio := E_EMPTY_TRANSLATION_UNIT, \ |
563 DISABLED_WARNINGS_solstudio := E_EMPTY_TRANSLATION_UNIT, \ |
562 MAPFILE := $(TOPDIR)/make/mapfiles/libawt_headless/mapfile-vers, \ |
564 MAPFILE := $(TOPDIR)/make/mapfiles/libawt_headless/mapfile-vers, \ |