equal
deleted
inserted
replaced
65 |
65 |
66 configure: $(CONFIGURE_32_and_64) |
66 configure: $(CONFIGURE_32_and_64) |
67 |
67 |
68 build: $(BUILD_32_and_64) |
68 build: $(BUILD_32_and_64) |
69 |
69 |
70 install: $(INSTALL_32_and_64) |
70 install: $(INSTALL_32_and_64) $(BUILD_DIR)/.merged-header |
71 |
71 |
72 test: $(TEST_32_and_64) |
72 test: $(TEST_32_and_64) |
73 |
73 |
74 system-test: $(SYSTEM_TESTS_NOT_IMPLEMENTED) |
74 system-test: $(SYSTEM_TESTS_NOT_IMPLEMENTED) |
|
75 |
|
76 $(BUILD_DIR)/.merged-header: $(BUILD_DIR_32)/.installed $(BUILD_DIR_64)/.installed |
|
77 -$(RM) $(PROTO_DIR)/usr/include/tiffconf.h |
|
78 $(GDIFF) -D _LP64 \ |
|
79 $(BUILD_DIR_32)/libtiff/tiffconf.h $(BUILD_DIR_64)/libtiff/tiffconf.h \ |
|
80 > $(PROTO_DIR)/usr/include/tiffconf.h; \ |
|
81 diffstatus=$$? ; \ |
|
82 if (( $$diffstatus != 1 )) ; then exit $$diffstatus ; fi |
75 |
83 |
76 REQUIRED_PACKAGES += compress/xz |
84 REQUIRED_PACKAGES += compress/xz |
77 REQUIRED_PACKAGES += image/library/libjpeg |
85 REQUIRED_PACKAGES += image/library/libjpeg |
78 REQUIRED_PACKAGES += library/zlib |
86 REQUIRED_PACKAGES += library/zlib |
79 REQUIRED_PACKAGES += system/library |
87 REQUIRED_PACKAGES += system/library |