equal
deleted
inserted
replaced
18 # |
18 # |
19 # CDDL HEADER END |
19 # CDDL HEADER END |
20 # |
20 # |
21 |
21 |
22 # |
22 # |
23 # Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved. |
23 # Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved. |
24 # |
24 # |
25 |
25 |
26 include ../../../make-rules/shared-macros.mk |
26 include ../../../make-rules/shared-macros.mk |
27 |
27 |
28 COMPONENT_NAME= tk |
28 COMPONENT_NAME= tk |
59 CONFIGURE_OPTIONS.64 += --with-tcl="$(COMPONENT_DIR)/../tcl/build/$(MACH64)" |
59 CONFIGURE_OPTIONS.64 += --with-tcl="$(COMPONENT_DIR)/../tcl/build/$(MACH64)" |
60 CONFIGURE_OPTIONS.64 += --enable-64bit |
60 CONFIGURE_OPTIONS.64 += --enable-64bit |
61 |
61 |
62 COMPONENT_TEST_TARGETS = test |
62 COMPONENT_TEST_TARGETS = test |
63 |
63 |
|
64 ASLR_MODE = $(ASLR_ENABLE) |
|
65 |
64 # common targets |
66 # common targets |
65 build: $(BUILD_32_and_64) |
67 build: $(BUILD_32_and_64) |
66 |
68 |
67 install: $(INSTALL_32_and_64) $(PROTOUSRLIBDIR)/tkConfig.sh |
69 install: $(INSTALL_32_and_64) $(PROTOUSRLIBDIR)/tkConfig.sh |
68 |
70 |