Commit 594f0c965d9bfcba9ef07ce54490a8ab7f6ba2a2
2000-12-20T22:09:41
* *.mk: Added lots of `.PHONY' targets. * *.mk: Implemented `platform' target to disable auto-detection. Added support for clipped direct rendering in the smooth renderer. This should not break binary compatibility of existing applications. * include/freetype/fttypes.h, include/freetype/ftimage.h: Move definition of the FT_BBox structure from the former to the latter. * include/freetype/ftimage.h: Add `ft_raster_flag_clip' value to FT_Raster_Flag enumeration. Add `clip_box' element to FT_Raster_Params structure. * src/smooth/ftgrays.c (grays_convert_glyph): Implement it. * src/raster/ftraster.c (ft_black_render): Test for unsupported direct rendering before testing arguments.
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387 388 389 390 391 392 393 394 395 396 397 398 399 400 401 402 403 404 405 406 407 408 409 410 411 412 413 414 415 416 417 418 419 420 421 422 423 424 425 426 427 428 429 430 431 432 433 434 435 436 437 438 439 440 441 442 443 444 445 446 447 448 449 450 451 452 453 454 455 456 457 458 459 460 461 462 463 464 465 466 467 468 469 470 471 472 473 474 475 476 477 478 479 480 481 482 483 484 485 486 487 488 489 490 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507 508 509 510 511 512 513 514 515 516 517 518 519 520 521 522 523 524 525 526 527 528 529 530 531 532 533 534 535 536 537 538 539 540 541 542 543 544 545 546 547 548 549 550 551 552 553 554 555 556 557 558 559 560 561 562 563 564 565 566 567 568 569 570 571 572 573 574 575 576 577 578 579 580 581 582 583 584 585 586 587 588 589 590 591 592 593 594 595 596 597 598 599 600 601 602 603 604 605 606 607 608 609 610 611 612 613 614 615 616 617 618 619 620 621 622 623 624 625 626 627 628 629 630 631 632 633 634 635 636 637 638 639 640 641 642 643 644 645 646 647 648 649 650 651 652 653 654 655 656 657 658 659 660 661 662 663 664 665 666 667 668 669 670 671 672 673 674 675 676 677 678 679 680 681 682 683 684 685 686 687 688 689 690 691 692 693 694 695 696 697 698 699 700 701 702 703 704 705 706 707 708 709 710 711 712 713 714 715 716 717 718 719 720 721 722 723 724 725 726 727 728 729 730 731 732 733 734 735 736 737 738 739 740 741 742 743 744 745 746 747 748 749 750 751 752 753 754 755 756 757 758 759 760 761 762 763 764 765 766 767 768 769 770 771 772 773 774 775 776 777 778 779 780 781 782 783 784 785 786 787 788 789 790 791 792 793 794 795 796 797 798 799 800 801 802 803 804 805 806 807 808 809 810 811 812 813 814 815 816 817 818 819 820 821 822 823 824 825 826 827 828 829 830 831 832 833 834 835 836 837 838 839 840 841 842 843 844 845 846 847 848 849 850 851 852 853 854 855 856 857 858 859 860 861 862 863 864 865 866 867 868 869 870 871 872 873 874 875 876 877 878 879 880 881 882 883 884 885 886 887 888 889 890 891 892 893 894 895 896 897 898 899 900 901 902 903 904 905 906 907 908 909 910 911 912 913 914 915 916 917 918 919 920 921 922 923 924 925 926 927 928 929 930 931 932 933 934 935 936 937 938 939 940 941 942 943 944 945 946 947 948 949 950 951 952 953 954 955 956 957 958 959 960 961 962 963 964 965 966 967 968 969 970 971 972 973 974 975 976 977 978 979 980 981 982 983 984 985 986 987 988 989 990 991 992 993 994 995 996 997 998 999 1000 1001 1002 1003 1004 1005
diff --git a/ChangeLog b/ChangeLog
index 16ef09e..8db754d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2000-12-17 Werner Lemberg <wl@gnu.org>
+
+ * *.mk: Added lots of `.PHONY' targets.
+
+2000-12-17 Karsten Fleischer <kfleisc1@ford.com>
+
+ * *.mk: Implemented `platform' target to disable auto-detection.
+
2000-12-14 Werner Lemberg <wl@gnu.org>
* docs/design/modules.html: Removed. Covered by design-*.html.
@@ -6,15 +14,23 @@
2000-12-14 David Turner <david.turner@freetype.org>
- * include/freetype/ftimage.h, include/freetype/fttypes.h,
- src/smooth/ftgrays.c: Added support for clipped direct rendering in
- the smooth renderer. This should not break binary compatibility of
- existing applications.
+ Added support for clipped direct rendering in the smooth renderer.
+ This should not break binary compatibility of existing applications.
+
+ * include/freetype/fttypes.h, include/freetype/ftimage.h: Move
+ definition of the FT_BBox structure from the former to the latter.
+ * include/freetype/ftimage.h: Add `ft_raster_flag_clip' value to
+ FT_Raster_Flag enumeration.
+ Add `clip_box' element to FT_Raster_Params structure.
+ * src/smooth/ftgrays.c (grays_convert_glyph): Implement it.
* INSTALL: Updated installation instructions on Win32, listing the
new "make setup list" target used to list supported
compilers/targets.
+ * src/raster/ftraster.c (ft_black_render): Test for unsupported
+ direct rendering before testing arguments.
+
2000-12-13 David Turner <david.turner@freetype.org>
* include/freetype/config/ft2build.h,
diff --git a/builds/ansi/ansi-def.mk b/builds/ansi/ansi-def.mk
index 9533a28..df98d10 100644
--- a/builds/ansi/ansi-def.mk
+++ b/builds/ansi/ansi-def.mk
@@ -93,6 +93,8 @@ ANSIFLAGS :=
ifdef BUILD_PROJECT
+ .PHONY: clean_project distclean_project
+
# Now include the main sub-makefile. It contains all the rules used to
# build the library with the previous variables defined.
#
diff --git a/builds/detect.mk b/builds/detect.mk
index 83a2220..eaf1dde 100644
--- a/builds/detect.mk
+++ b/builds/detect.mk
@@ -70,17 +70,39 @@ CONFIG_RULES = $(BUILD)$(SEP)$(CONFIG_FILE)
#
BACKSLASH := $(strip \ )
-# Now, include all detection rule files found in the `builds/<system>'
-# directories. Note that the calling order of the various `detect.mk' files
-# isn't predictable.
+# Find all auto-detectable platforms.
#
-include $(wildcard $(BUILD_CONFIG_)*/detect.mk)
+PLATFORMS_ := $(notdir $(subst /detect.mk,,$(wildcard $(BUILD_CONFIG_)*/detect.mk)))
+.PHONY: $(PLATFORMS_) ansi
+
+# Filter out platform specified as setup target.
+#
+PLATFORM := $(firstword $(filter $(MAKECMDGOALS),$(PLATFORMS_)))
+
+# If no setup target platform was specified, enable auto-detection/
+# default platform.
+#
+ifeq ($(PLATFORM),)
+ PLATFORM := ansi
+endif
+
+# If the user has explicitly asked for `ansi' on the command line,
+# disable auto-detection.
+#
+ifeq ($(findstring ansi,$(MAKECMDGOALS)),)
+ # Now, include all detection rule files found in the `builds/<system>'
+ # directories. Note that the calling order of the various `detect.mk'
+ # files isn't predictable.
+ #
+ include $(wildcard $(BUILD_CONFIG_)*/detect.mk)
+endif
# In case no detection rule file was successful, use the default.
#
ifndef CONFIG_FILE
CONFIG_FILE := ansi.mk
setup: std_setup
+ .PHONY: setup
endif
# The following targets are equivalent, with the exception that they use
diff --git a/builds/dos/detect.mk b/builds/dos/detect.mk
index 450c7e0..65eb42d 100644
--- a/builds/dos/detect.mk
+++ b/builds/dos/detect.mk
@@ -13,43 +13,24 @@
# fully.
-# Test for DJGPP by checking the DJGPP environment variable, which must be
-# set in order to use the system (ie. it will always be present when the
-# `make' utility is run).
-#
-ifeq ($(PLATFORM),ansi)
-
- ifdef DJGPP
- # We are definitely using DJGPP
- PLATFORM := dos
- DELETE := del
- COPY := copy
- CONFIG_FILE := dos-gcc.mk
- SEP := /
- ifndef CC
- CC := gcc
- endif # test CC
-
- setup : dos_setup
-
- endif # test DJGPP
-endif # test PLATFORM
-
+.PHONY: setup
-# We test for the COMSPEC environment variable, then run the `ver'
-# command-line program to see if its output contains the word `Dos'.
-#
-# If this is true, we are running a Dos-ish platform (or an emulation).
-#
ifeq ($(PLATFORM),ansi)
- ifdef COMSPEC
- #
- # We try to recognize a Cygwin session, in which case we're
- # certainly not running on DOS!
- #
- ifneq ($(OSTYPE),cygwin)
+ # Test for DJGPP by checking the DJGPP environment variable, which must be
+ # set in order to use the system (ie. it will always be present when the
+ # `make' utility is run).
+ #
+ # We test for the COMSPEC environment variable, then run the `ver'
+ # command-line program to see if its output contains the word `Dos'.
+ #
+ # If this is true, we are running a Dos-ish platform (or an emulation).
+ #
+ ifdef DJGPP
+ PLATFORM := dos
+ else
+ ifdef COMSPEC
is_dos := $(findstring Dos,$(shell ver))
# We try to recognize a Dos session under OS/2. The `ver' command
@@ -59,58 +40,66 @@ ifeq ($(PLATFORM),ansi)
# substring `MDOS\COMMAND'
#
ifeq ($(is_dos),)
- is_dos := $(findstring MDOS\COMMAND,$(COMSPEC))
+ is_dos := $(findstring MDOS\COMMAND,$(COMSPEC))
endif
- endif # test Cygwin
- endif # test COMSPEC
+ endif # test COMSPEC
- ifneq ($(is_dos),)
+ ifneq ($(is_dos),)
- PLATFORM := dos
- DELETE := del
- COPY := copy
-
- # Use DJGPP (i.e. gcc) by default.
- #
- CONFIG_FILE := dos-gcc.mk
- SEP := /
- ifndef CC
- CC := gcc
- endif
-
- # additionally, we provide hooks for various other compilers
- #
- ifneq ($(findstring turboc,$(MAKECMDGOALS)),) # Turbo C
- CONFIG_FILE := dos-tcc.mk
- SEP := $(BACKSLASH)
- CC := tcc
- .PHONY: turboc
- endif
-
- ifneq ($(findstring watcom,$(MAKECMDGOALS)),) # Watcom C/C++
- CONFIG_FILE := dos-wat.mk
- SEP := $(BACKSLASH)
- CC := wcc386
- .PHONY: watcom
- endif
-
- ifneq ($(findstring borlandc16,$(MAKECMDGOALS)),) # Borland C/C++ 16-bit
- CONFIG_FILE := dos-bcc.mk
- SEP := $(BACKSLASH)
- CC := bcc
- .PHONY: borlandc16
- endif
-
- ifneq ($(findstring borlandc,$(MAKECMDGOALS)),) # Borland C/C++ 32-bit
- CONFIG_FILE := dos-bcc.mk
- SEP := $(BACKSLASH)
- CC := bcc32
- .PHONY: borlandc
- endif
-
- setup: dos_setup
-
- endif # test Dos
-endif # test PLATFORM
+ PLATFORM := dos
+
+ endif # test Dos
+ endif # test DJGPP
+endif # test PLATFORM ansi
+
+ifeq ($(PLATFORM),dos)
+ DELETE := del
+ COPY := copy
+
+ # Use DJGPP (i.e. gcc) by default.
+ #
+ CONFIG_FILE := dos-gcc.mk
+ SEP := /
+ ifndef CC
+ CC := gcc
+ endif
+
+ # additionally, we provide hooks for various other compilers
+ #
+ ifneq ($(findstring turboc,$(MAKECMDGOALS)),) # Turbo C
+ CONFIG_FILE := dos-tcc.mk
+ SEP := $(BACKSLASH)
+ CC := tcc
+ turboc: setup
+ .PHONY: turboc
+ endif
+
+ ifneq ($(findstring watcom,$(MAKECMDGOALS)),) # Watcom C/C++
+ CONFIG_FILE := dos-wat.mk
+ SEP := $(BACKSLASH)
+ CC := wcc386
+ watcom: setup
+ .PHONY: watcom
+ endif
+
+ ifneq ($(findstring borlandc16,$(MAKECMDGOALS)),) # Borland C/C++ 16-bit
+ CONFIG_FILE := dos-bcc.mk
+ SEP := $(BACKSLASH)
+ CC := bcc
+ borlandc16: setup
+ .PHONY: borlandc16
+ endif
+
+ ifneq ($(findstring borlandc,$(MAKECMDGOALS)),) # Borland C/C++ 32-bit
+ CONFIG_FILE := dos-bcc.mk
+ SEP := $(BACKSLASH)
+ CC := bcc32
+ borlandc: setup
+ .PHONY: borlandc
+ endif
+
+ setup: dos_setup
+
+endif # test PLATFORM dos
# EOF
diff --git a/builds/dos/dos-def.mk b/builds/dos/dos-def.mk
index 16f4e0d..ec7f766 100644
--- a/builds/dos/dos-def.mk
+++ b/builds/dos/dos-def.mk
@@ -58,6 +58,8 @@ NO_OUTPUT = &> nul
ifdef BUILD_PROJECT
+ .PHONY: clean_project distclean_project
+
# Now include the main sub-makefile. It contains all the rules used to
# build the library with the previous variables defined.
#
diff --git a/builds/freetype.mk b/builds/freetype.mk
index a1419cd..15861ff 100644
--- a/builds/freetype.mk
+++ b/builds/freetype.mk
@@ -70,7 +70,7 @@
# The targets `objects' and `library' are defined at the end of this
# Makefile after all other rules have been included.
#
-.PHONY: single objects library
+.PHONY: single multi objects library
# default target -- build single objects and library
#
@@ -255,6 +255,8 @@ library: $(PROJECT_LIBRARY)
$(FT_COMPILE) $T$@ $<
+.PHONY: clean_project_std distclean_project_std
+
# Standard cleaning and distclean rules. These are not accepted
# on all systems though.
#
@@ -265,6 +267,9 @@ distclean_project_std: clean_project_std
-$(DELETE) $(PROJECT_LIBRARY)
-$(DELETE) *.orig *~ core *.core $(DISTCLEAN)
+
+.PHONY: clean_project_dos distclean_project_dos
+
# The Dos command shell does not support very long list of arguments, so
# we are stuck with wildcards.
#
@@ -276,12 +281,17 @@ distclean_project_dos: clean_project_dos
-$(DELETE) $(subst $(SEP),$(HOSTSEP),$(PROJECT_LIBRARY)) \
$(DISTCLEAN) $(NO_OUTPUT)
+
+.PHONY: remove_config_mk
+
# Remove configuration file (used for distclean).
#
remove_config_mk:
-$(DELETE) $(subst $(SEP),$(HOSTSEP),$(CONFIG_MK)) $(NO_OUTPUT)
+.PHONY: clean distclean
+
# The `config.mk' file must define `clean_freetype' and
# `distclean_freetype'. Implementations may use to relay these to either
# the `std' or `dos' versions from above, or simply provide their own
diff --git a/builds/link_dos.mk b/builds/link_dos.mk
index 5b1d497..b35115b 100644
--- a/builds/link_dos.mk
+++ b/builds/link_dos.mk
@@ -15,6 +15,8 @@
ifdef BUILD_PROJECT
+ .PHONY: clean_project distclean_project
+
# Now include the main sub-makefile. It contains all the rules used to
# build the library with the previous variables defined.
#
diff --git a/builds/link_std.mk b/builds/link_std.mk
index ecba73b..2a7b26d 100644
--- a/builds/link_std.mk
+++ b/builds/link_std.mk
@@ -15,6 +15,8 @@
ifdef BUILD_PROJECT
+ .PHONY: clean_project distclean_project
+
# Now include the main sub-makefile. It contains all the rules used to
# build the library with the previous variables defined.
#
diff --git a/builds/modules.mk b/builds/modules.mk
index 2ff0e50..59f1223 100644
--- a/builds/modules.mk
+++ b/builds/modules.mk
@@ -20,7 +20,7 @@
# This file is in charge of handling the generation of the modules list
# file.
-.PHONY: make_module_list clean_module_list remake_module_list
+.PHONY: make_module_list clean_module_list
# MODULE_LIST, as its name suggests, indicates where the modules list
# resides. For now, it is in `include/freetype/config/ftmodule.h'.
diff --git a/builds/os2/detect.mk b/builds/os2/detect.mk
index ac457ae..d332be7 100644
--- a/builds/os2/detect.mk
+++ b/builds/os2/detect.mk
@@ -13,51 +13,63 @@
# fully.
+.PHONY: setup
+
+
ifeq ($(PLATFORM),ansi)
ifdef OS2_SHELL
PLATFORM := os2
- COPY := copy
- DELETE := del
- # gcc-emx by default
- CONFIG_FILE := os2-gcc.mk
+ endif # test OS2_SHELL
+endif
+
+ifeq ($(PLATFORM),os2)
+
+ COPY := copy
+ DELETE := del
+
+ # gcc-emx by default
+ CONFIG_FILE := os2-gcc.mk
+ SEP := /
+
+ # additionally, we provide hooks for various other compilers
+ #
+ ifneq ($(findstring visualage,$(MAKECMDGOALS)),) # Visual Age C++
+ CONFIG_FILE := os2-icc.mk
+ SEP := $(BACKSLASH)
+ CC := icc
+ visualage: setup
+ .PHONY: visualage
+ endif
+
+ ifneq ($(findstring watcom,$(MAKECMDGOALS)),) # Watcom C/C++
+ CONFIG_FILE := os2-wat.mk
+ SEP := $(BACKSLASH)
+ CC := wcc386
+ watcom: setup
+ .PHONY: watcom
+ endif
+
+ ifneq ($(findstring borlandc,$(MAKECMDGOALS)),) # Borland C++ 32-bit
+ CONFIG_FILE := os2-bcc.mk
+ SEP := $(BACKSLASH)
+ CC := bcc32
+ borlandc: setup
+ .PHONY: borlandc
+ endif
+
+ ifneq ($(findstring devel,$(MAKECMDGOALS)),) # development target
+ CONFIG_FILE := os2-dev.mk
+ CC := gcc
SEP := /
+ devel: setup
+ .PHONY: devel
+ endif
- # additionally, we provide hooks for various other compilers
- #
- ifneq ($(findstring visualage,$(MAKECMDGOALS)),) # Visual Age C++
- CONFIG_FILE := os2-icc.mk
- SEP := $(BACKSLASH)
- CC := icc
- .PHONY: visualage
- endif
-
- ifneq ($(findstring watcom,$(MAKECMDGOALS)),) # Watcom C/C++
- CONFIG_FILE := os2-wat.mk
- SEP := $(BACKSLASH)
- CC := wcc386
- .PHONY: watcom
- endif
-
- ifneq ($(findstring borlandc,$(MAKECMDGOALS)),) # Borland C++ 32-bit
- CONFIG_FILE := os2-bcc.mk
- SEP := $(BACKSLASH)
- CC := bcc32
- .PHONY: borlandc
- endif
-
- ifneq ($(findstring devel,$(MAKECMDGOALS)),) # development target
- CONFIG_FILE := os2-dev.mk
- CC := gcc
- SEP := /
- devel: setup
- endif
-
- setup: dos_setup
+ setup: dos_setup
- endif # test OS2_SHELL
-endif # test PLATFORM
+endif # test PLATFORM os2
# EOF
diff --git a/builds/os2/os2-def.mk b/builds/os2/os2-def.mk
index 42f505d..b65b591 100644
--- a/builds/os2/os2-def.mk
+++ b/builds/os2/os2-def.mk
@@ -58,6 +58,8 @@ NO_OUTPUT = 2> nul
ifdef BUILD_LIBRARY
+ .PHONY: clean_project distclean_project
+
# Now include the main sub-makefile. It contains all the rules used to
# build the library with the previous variables defined.
#
diff --git a/builds/os2/os2-dev.mk b/builds/os2/os2-dev.mk
index 0df4bbc..db7f3d5 100644
--- a/builds/os2/os2-dev.mk
+++ b/builds/os2/os2-dev.mk
@@ -109,6 +109,8 @@ ANSIFLAGS := -ansi -pedantic
ifdef BUILD_FREETYPE
+ .PHONY: clean_freetype distclean_freetype
+
# Now include the main sub-makefile. It contains all the rules used to
# build the library with the previous variables defined.
#
diff --git a/builds/os2/os2-gcc.mk b/builds/os2/os2-gcc.mk
index 2bed133..6470c72 100644
--- a/builds/os2/os2-gcc.mk
+++ b/builds/os2/os2-gcc.mk
@@ -108,6 +108,8 @@ ANSIFLAGS := -ansi -pedantic
ifdef BUILD_FREETYPE
+ .PHONY: clean_freetype distclean_freetype
+
# Now include the main sub-makefile. It contains all the rules used to
# build the library with the previous variables defined.
#
diff --git a/builds/toplevel.mk b/builds/toplevel.mk
index fe1af48..f05ca0d 100644
--- a/builds/toplevel.mk
+++ b/builds/toplevel.mk
@@ -34,7 +34,7 @@
# details on host platform detection and library builds.
-.PHONY: setup distclean
+.PHONY: all setup distclean modules
# The `space' variable is used to avoid trailing spaces in defining the
# `T' variable later.
@@ -71,6 +71,8 @@ endif
#
ifdef check_platform
+ # This is the first rule `make' sees.
+ #
all: setup
ifdef USE_MODULES
@@ -92,7 +94,8 @@ ifdef check_platform
# This rule makes sense for Unix only to remove files created by a run
# of the configure script which hasn't been successful (so that no
# `config.mk' has been created). It uses the built-in $(RM) command of
- # GNU make.
+ # GNU make. Similarly, `nul' is created if e.g. `make setup win32' has
+ # been erroneously used.
#
distclean:
$(RM) builds/unix/config.cache
@@ -100,6 +103,7 @@ ifdef check_platform
$(RM) builds/unix/config.status
$(RM) builds/unix/unix-def.mk
$(RM) builds/unix/unix-cc.mk
+ $(RM) nul
# IMPORTANT:
#
diff --git a/builds/unix/detect.mk b/builds/unix/detect.mk
index 5c85bb4..903a574 100644
--- a/builds/unix/detect.mk
+++ b/builds/unix/detect.mk
@@ -12,7 +12,7 @@
# indicate that you have read the license and understand and accept it
# fully.
-.PHONY: devel lcc setup unix
+.PHONY: setup
ifeq ($(PLATFORM),ansi)
@@ -20,52 +20,59 @@ ifeq ($(PLATFORM),ansi)
ifneq ($(has_init),)
PLATFORM := unix
- COPY := cp
- DELETE := rm -f
+ endif # test has_init
+endif # test PLATFORM ansi
- # If `devel' is the requested target, we use a special configuration
- # file named `unix-dev.mk'. It disables optimization and libtool.
+ifeq ($(PLATFORM),unix)
+ COPY := cp
+ DELETE := rm -f
+
+ # If `devel' is the requested target, we use a special configuration
+ # file named `unix-dev.mk'. It disables optimization and libtool.
+ #
+ ifneq ($(findstring devel,$(MAKECMDGOALS)),)
+ CONFIG_FILE := unix-dev.mk
+ CC := gcc
+ devel: setup
+ .PHONY: devel
+ else
+
+ # If `lcc' is the requested target, we use a special configuration
+ # file named `unix-lcc.mk'. It disables libtool for LCC.
#
- ifneq ($(findstring devel,$(MAKECMDGOALS)),)
- CONFIG_FILE := unix-dev.mk
- CC := gcc
- devel: setup
+ ifneq ($(findstring lcc,$(MAKECMDGOALS)),)
+ CONFIG_FILE := unix-lcc.mk
+ CC := lcc
+ lcc: setup
+ .PHONY: lcc
else
- # If `lccl' is the requested target, we use a special configuration
- # file named `unix-lcc.mk'. It disables libtool for LCC
+ # If a Unix platform is detected, the configure script is called and
+ # `unix-def.mk' together with `unix-cc.mk' is created.
+ #
+ # Arguments to `configure' should be in the CFG variable. Example:
+ #
+ # make CFG="--prefix=/usr --disable-static"
+ #
+ # If you need to set CFLAGS or LDFLAGS, do it here also.
+ #
+ # Feel free to add support for other platform specific compilers in
+ # this directory (e.g. solaris.mk + changes here to detect the
+ # platform).
#
- ifneq ($(findstring lcc,$(MAKECMDGOALS)),)
- CONFIG_FILE := unix-lcc.mk
- CC := lcc
- lcc: setup
- else
- # If a Unix platform is detected, the configure script is called and
- # `unix-def.mk' together with `unix-cc.mk' is created.
- #
- # Arguments to `configure' should be in the CFG variable. Example:
- #
- # make CFG="--prefix=/usr --disable-static"
- #
- # If you need to set CFLAGS or LDFLAGS, do it here also.
- #
- # Feel free to add support for other platform specific compilers in
- # this directory (e.g. solaris.mk + changes here to detect the
- # platform).
- #
- CONFIG_FILE := unix.mk
- setup: unix-def.mk
- unix: setup
- endif
+ CONFIG_FILE := unix.mk
+ setup: unix-def.mk
+ unix: setup
+ .PHONY: unix
endif
+ endif
- setup: std_setup
+ setup: std_setup
- unix-def.mk: $(TOP)/builds/unix/unix-def.in
- cd builds/unix; ./configure $(CFG)
+ unix-def.mk: $(TOP)/builds/unix/unix-def.in
+ cd builds/unix; ./configure $(CFG)
- endif # test Unix
-endif # test PLATFORM
+endif # test PLATFORM unix
# EOF
diff --git a/builds/unix/install.mk b/builds/unix/install.mk
index 16403f6..840f39c 100644
--- a/builds/unix/install.mk
+++ b/builds/unix/install.mk
@@ -13,6 +13,8 @@
# fully.
+.PHONY: install uninstall
+
# Unix installation and deinstallation targets.
install: $(PROJECT_LIBRARY)
$(MKINSTALLDIRS) $(libdir) \
@@ -52,6 +54,8 @@ uninstall:
-$(DELETE) $(bindir)/freetype-config
+.PHONY: clean_project_unix distclean_project_unix
+
# Unix cleaning and distclean rules.
#
clean_project_unix:
diff --git a/builds/unix/unix.mk b/builds/unix/unix.mk
index 027f3c9..5488d7b 100644
--- a/builds/unix/unix.mk
+++ b/builds/unix/unix.mk
@@ -18,6 +18,8 @@ include $(TOP)/builds/unix/unix-cc.mk
ifdef BUILD_PROJECT
+ .PHONY: clean_project distclean_project
+
# Now include the main sub-makefile. It contains all the rules used to
# build the library with the previous variables defined.
#
diff --git a/builds/win32/detect.mk b/builds/win32/detect.mk
index 055de02..5604cec 100644
--- a/builds/win32/detect.mk
+++ b/builds/win32/detect.mk
@@ -13,6 +13,9 @@
# fully.
+.PHONY: setup
+
+
ifeq ($(PLATFORM),ansi)
# Detecting Windows NT is easy, as the OS variable must be defined and
@@ -21,134 +24,124 @@ ifeq ($(PLATFORM),ansi)
#
ifeq ($(OS),Windows_NT)
- # Check if we are running on a CygWin system by checking the OSTYPE
- # variable.
- ifneq ($(OSTYPE),cygwin)
- is_windows := 1
- endif
+ is_windows := 1
- # We test for the COMSPEC environment variable, then run the `ver'
- # command-line program to see if its output contains the word `Windows'.
- #
- # If this is true, we are running a win32 platform (or an emulation).
- #
+ # We test for the COMSPEC environment variable, then run the `ver'
+ # command-line program to see if its output contains the word `Windows'.
+ #
+ # If this is true, we are running a win32 platform (or an emulation).
+ #
else
- ifneq ($(OSTYPE),cygwin)
- ifdef COMSPEC
- is_windows := $(findstring Windows,$(strip $(shell ver)))
- endif
- endif # test CygWin
+ ifdef COMSPEC
+ is_windows := $(findstring Windows,$(strip $(shell ver)))
+ endif
endif # test NT
ifdef is_windows
- PLATFORM := win32
- DELETE := del
- COPY := copy
- CONFIG_FILE := none
-
- ifneq ($(findstring list,$(MAKECMDGOALS)),) # test for the "list" target
-
- .PHONY: dump_target_list setup list
-
- dump_target_list:
- @echo ˙
- @echo $(PROJECT_TITLE) build system -- supported compilers
- @echo ˙
- @echo Several command-line compilers are supported on Win32:
- @echo ˙
- @echo ˙˙make setup˙˙˙˙˙˙˙˙˙˙˙˙˙˙˙˙˙˙˙˙˙gcc (with Mingw)
- @echo ˙˙make setup visualc˙˙˙˙˙˙˙˙˙˙˙˙˙Microsoft Visual C++
- @echo ˙˙make setup bcc32˙˙˙˙˙˙˙˙˙˙˙˙˙˙˙Borland C/C++
- @echo ˙˙make setup lcc˙˙˙˙˙˙˙˙˙˙˙˙˙˙˙˙˙Win32-LCC
- @echo ˙˙make setup intelc˙˙˙˙˙˙˙˙˙˙˙˙˙˙Intel C/C++
- @echo ˙
-
- setup: dump_target_list
-
- else # test "list"
-
- # gcc Makefile by default
- CONFIG_FILE := w32-gcc.mk
- SEP := /
- ifeq ($(firstword $(CC)),cc)
- CC := gcc
- endif
-
- # additionally, we provide hooks for various other compilers
- #
- ifneq ($(findstring visualc,$(MAKECMDGOALS)),) # Visual C/C++
- CONFIG_FILE := w32-vcc.mk
- SEP := $(BACKSLASH)
- CC := cl
- visualc: setup
- endif
-
- ifneq ($(findstring bcc32,$(MAKECMDGOALS)),) # Borland C++
- CONFIG_FILE := w32-bcc.mk
- SEP := $(BACKSLASH)
- CC := bcc32
- bcc32: setup
- endif
-
- ifneq ($(findstring lcc,$(MAKECMDGOALS)),) # LCC-Win32
- CONFIG_FILE := w32-lcc.mk
- SEP := $(BACKSLASH)
- CC := lcc
- lcc: setup
- endif
-
- ifneq ($(findstring intelc,$(MAKECMDGOALS)),) # Intel C/C++
- CONFIG_FILE := w32-intl.mk
- SEP := $(BACKSLASH)
- CC := icl
- intelc: setup
- endif
-
- #
- # The following build targets are not officially supported for now
- #
-
- ifneq ($(findstring visualage,$(MAKECMDGOALS)),) # Visual Age C++
- CONFIG_FILE := w32-icc.mk
- SEP := $(BACKSLASH)
- CC := icc
- visualage: setup
- endif
-
- ifneq ($(findstring watcom,$(MAKECMDGOALS)),) # Watcom C/C++
- CONFIG_FILE := w32-wat.mk
- SEP := $(BACKSLASH)
- CC := wcc386
- watcom: setup
- endif
-
- ifneq ($(findstring cygwin,$(MAKECMDGOALS)),) # Cygwin
- CONFIG_FILE := w32-cygw.mk
- SEP := $(BACKSLASH)
- CC := gcc
- cygwin: setup
- endif
-
- ifneq ($(findstring devel-bcc,$(MAKECMDGOALS)),) # development target
- CONFIG_FILE := w32-bccd.mk
- CC := bcc32
- SEP := /
- devel: setup
- endif
-
- ifneq ($(findstring devel-gcc,$(MAKECMDGOALS)),) # development target
- CONFIG_FILE := w32-dev.mk
- CC := gcc
- SEP := /
- devel: setup
- endif
-
- setup: dos_setup
-
- endif # test "list"
-
- endif # test is_windows
-endif # test PLATFORM
+ PLATFORM := win32
+
+ endif
+endif # test PLATFORM ansi
+
+ifeq ($(PLATFORM),win32)
+
+ DELETE := del
+ COPY := copy
+
+ # gcc Makefile by default
+ CONFIG_FILE := w32-gcc.mk
+ SEP := /
+ ifeq ($(firstword $(CC)),cc)
+ CC := gcc
+ endif
+
+ ifneq ($(findstring list,$(MAKECMDGOALS)),) # test for the "list" target
+ dump_target_list:
+ @echo ˙
+ @echo $(PROJECT_TITLE) build system -- supported compilers
+ @echo ˙
+ @echo Several command-line compilers are supported on Win32:
+ @echo ˙
+ @echo ˙˙make setup˙˙˙˙˙˙˙˙˙˙˙˙˙˙˙˙˙˙˙˙˙gcc (with Mingw)
+ @echo ˙˙make setup visualc˙˙˙˙˙˙˙˙˙˙˙˙˙Microsoft Visual C++
+ @echo ˙˙make setup bcc32˙˙˙˙˙˙˙˙˙˙˙˙˙˙˙Borland C/C++
+ @echo ˙˙make setup lcc˙˙˙˙˙˙˙˙˙˙˙˙˙˙˙˙˙Win32-LCC
+ @echo ˙˙make setup intelc˙˙˙˙˙˙˙˙˙˙˙˙˙˙Intel C/C++
+ @echo ˙
+
+ setup: dump_target_list
+ .PHONY: dump_target_list list
+ else
+ setup: dos_setup
+ endif
+
+ # additionally, we provide hooks for various other compilers
+ #
+ ifneq ($(findstring visualc,$(MAKECMDGOALS)),) # Visual C/C++
+ CONFIG_FILE := w32-vcc.mk
+ SEP := $(BACKSLASH)
+ CC := cl
+ visualc: setup
+ .PHONY: visualc
+ endif
+
+ ifneq ($(findstring watcom,$(MAKECMDGOALS)),) # Watcom C/C++
+ CONFIG_FILE := w32-wat.mk
+ SEP := $(BACKSLASH)
+ CC := wcc386
+ watcom: setup
+ .PHONY: watcom
+ endif
+
+ ifneq ($(findstring visualage,$(MAKECMDGOALS)),) # Visual Age C++
+ CONFIG_FILE := w32-icc.mk
+ SEP := $(BACKSLASH)
+ CC := icc
+ visualage: setup
+ .PHONY: visualage
+ endif
+
+ ifneq ($(findstring lcc,$(MAKECMDGOALS)),) # LCC-Win32
+ CONFIG_FILE := w32-lcc.mk
+ SEP := $(BACKSLASH)
+ CC := lcc
+ lcc: setup
+ .PHONY: lcc
+ endif
+
+ ifneq ($(findstring mingw32,$(MAKECMDGOALS)),) # mingw32
+ CONFIG_FILE := w32-mingw32.mk
+ SEP := $(BACKSLASH)
+ CC := gcc
+ mingw32: setup
+ .PHONY: mingw32
+ endif
+
+ ifneq ($(findstring bcc32,$(MAKECMDGOALS)),) # Borland C++
+ CONFIG_FILE := w32-bcc.mk
+ SEP := $(BACKSLASH)
+ CC := bcc32
+ bcc32: setup
+ .PHONY: bcc32
+ endif
+
+ ifneq ($(findstring devel-bcc,$(MAKECMDGOALS)),) # development target
+ CONFIG_FILE := w32-bccd.mk
+ CC := bcc32
+ SEP := /
+ devel-bcc: setup
+ .PHONY: devel-bcc
+ endif
+
+ ifneq ($(findstring devel-gcc,$(MAKECMDGOALS)),) # development target
+ CONFIG_FILE := w32-dev.mk
+ CC := gcc
+ SEP := /
+ devel-gcc: setup
+ .PHONY: devel-gcc
+ endif
+
+endif # test PLATFORM win32
# EOF
diff --git a/src/smooth/ftgrays.c b/src/smooth/ftgrays.c
index f90a698..d06bb28 100644
--- a/src/smooth/ftgrays.c
+++ b/src/smooth/ftgrays.c
@@ -1700,10 +1700,10 @@
0
};
- TBand bands[40], *band;
- int n, num_bands;
- TPos min, max, max_y;
- FT_BBox* clip;
+ TBand bands[40], *band;
+ int n, num_bands;
+ TPos min, max, max_y;
+ FT_BBox* clip;
/* Set up state in the raster object */
@@ -1857,7 +1857,7 @@
return ErrRaster_Invalid_Mode;
/* compute clipping box */
- if ( (params->flags & ft_raster_flag_direct) == 0 )
+ if ( ( params->flags & ft_raster_flag_direct ) == 0 )
{
/* compute clip box from target pixmap */
ras.clip_box.xMin = 0;