Clean up, formatting etc. Fixing rules for installing cache headers on Unix. Updating builds/unix/ftconfig.in.
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
diff --git a/builds/ansi/ansi-def.mk b/builds/ansi/ansi-def.mk
index 4c40718..a20dbd3 100644
--- a/builds/ansi/ansi-def.mk
+++ b/builds/ansi/ansi-def.mk
@@ -29,7 +29,7 @@ endif
# The directory where all library files are placed.
#
-# By default, this is the same as $(OBJ_DIR), however, this can be changed
+# By default, this is the same as $(OBJ_DIR); however, this can be changed
# to suit particular needs.
#
LIB_DIR := $(OBJ_DIR)
@@ -48,7 +48,7 @@ I := -I
# C flag used to define a macro before the compilation of a given source
-# object. Usually is `-D' like in `-DDEBUG'.
+# object. Usually it is `-D' like in `-DDEBUG'.
#
D := -D
diff --git a/builds/compiler/ansi-cc.mk b/builds/compiler/ansi-cc.mk
index 912d3b5..6faeab1 100644
--- a/builds/compiler/ansi-cc.mk
+++ b/builds/compiler/ansi-cc.mk
@@ -4,6 +4,7 @@
#
# Compiler command line name
+#
CC := cc
# The object file extension (for standard and static libraries). This can be
@@ -26,7 +27,7 @@ I := -I
# C flag used to define a macro before the compilation of a given source
-# object. Usually is `-D' like in `-DDEBUG'.
+# object. Usually it is `-D' like in `-DDEBUG'.
#
D := -D
diff --git a/builds/compiler/gcc-dev.mk b/builds/compiler/gcc-dev.mk
index d9d14cf..12ec3a6 100644
--- a/builds/compiler/gcc-dev.mk
+++ b/builds/compiler/gcc-dev.mk
@@ -1,9 +1,10 @@
# Copyright 2000 David Turner
#
-# gcc-specific with NO OPTIMISATIONS + DEBUGGING
+# gcc-specific with NO OPTIMIZATIONS + DEBUGGING
#
# Compiler command line name
+#
CC := gcc
# The object file extension (for standard and static libraries). This can be
@@ -26,7 +27,7 @@ I := -I
# C flag used to define a macro before the compilation of a given source
-# object. Usually is `-D' like in `-DDEBUG'.
+# object. Usually it is `-D' like in `-DDEBUG'.
#
D := -D
@@ -61,8 +62,9 @@ ANSIFLAGS := -ansi -pedantic
# Library linking
#
ifndef CLEAN_LIBRARY
-CLEAN_LIBRARY = $(DELETE) $(subst $(SEP),$(HOSTSEP),$(PROJECT_LIBRARY)) $(NO_OUTPUT)
+ CLEAN_LIBRARY = $(DELETE) $(subst $(SEP),$(HOSTSEP),$(PROJECT_LIBRARY)) \
+ $(NO_OUTPUT)
endif
-LINK_LIBRARY = $(AR) -r $@ $(OBJECTS_LIST)
+LINK_LIBRARY = $(AR) -r $@ $(OBJECTS_LIST)
# EOF
diff --git a/builds/compiler/gcc.mk b/builds/compiler/gcc.mk
index ce92296..e1d4706 100644
--- a/builds/compiler/gcc.mk
+++ b/builds/compiler/gcc.mk
@@ -4,6 +4,7 @@
#
# Compiler command line name
+#
CC := gcc
# The object file extension (for standard and static libraries). This can be
@@ -26,7 +27,7 @@ I := -I
# C flag used to define a macro before the compilation of a given source
-# object. Usually is `-D' like in `-DDEBUG'.
+# object. Usually it is `-D' like in `-DDEBUG'.
#
D := -D
@@ -61,8 +62,9 @@ ANSIFLAGS := -ansi -pedantic
# Library linking
#
ifndef CLEAN_LIBRARY
-CLEAN_LIBRARY = $(DELETE) $(subst $(SEP),$(HOSTSEP),$(PROJECT_LIBRARY)) $(NO_OUTPUT)
+ CLEAN_LIBRARY = $(DELETE) $(subst $(SEP),$(HOSTSEP),$(PROJECT_LIBRARY)) \
+ $(NO_OUTPUT)
endif
-LINK_LIBRARY = $(AR) -r $@ $(OBJECTS_LIST)
+LINK_LIBRARY = $(AR) -r $@ $(OBJECTS_LIST)
# EOF
diff --git a/builds/compiler/visualage.mk b/builds/compiler/visualage.mk
index ec04c5f..7a745cf 100644
--- a/builds/compiler/visualage.mk
+++ b/builds/compiler/visualage.mk
@@ -6,18 +6,21 @@
#
CC := icc
+
# The object file extension (for standard and static libraries). This can be
# .o, .tco, .obj, etc., depending on the platform.
#
O := obj
SO := obj
+
# The library file extension (for standard and static libraries). This can
# be .a, .lib, etc., depending on the platform.
#
A := lib
SA := lib
+
# Path inclusion flag. Some compilers use a different flag than `-I' to
# specify an additional include path. Examples are `/i=' or `-J'.
#
diff --git a/builds/compiler/visualc.mk b/builds/compiler/visualc.mk
index 2d50a70..e0630b6 100644
--- a/builds/compiler/visualc.mk
+++ b/builds/compiler/visualc.mk
@@ -3,14 +3,17 @@
#
# compiler command line name
+#
CC := cl
+
# The object file extension (for standard and static libraries). This can be
# .o, .tco, .obj, etc., depending on the platform.
#
O := obj
SO := obj
+
# The library file extension (for standard and static libraries). This can
# be .a, .lib, etc., depending on the platform.
#
@@ -25,7 +28,7 @@ I := /I
# C flag used to define a macro before the compilation of a given source
-# object. Usually is `-D' like in `-DDEBUG'.
+# object. Usually it is `-D' like in `-DDEBUG'.
#
D := /D
diff --git a/builds/compiler/win-lcc.mk b/builds/compiler/win-lcc.mk
index ba8e379..b734882 100644
--- a/builds/compiler/win-lcc.mk
+++ b/builds/compiler/win-lcc.mk
@@ -6,12 +6,14 @@
#
CC := lcc
+
# The object file extension (for standard and static libraries). This can be
# .o, .tco, .obj, etc., depending on the platform.
#
O := obj
SO := obj
+
# The library file extension (for standard and static libraries). This can
# be .a, .lib, etc., depending on the platform.
#
@@ -26,7 +28,7 @@ I := -I
# C flag used to define a macro before the compilation of a given source
-# object. Usually is `-D' like in `-DDEBUG'.
+# object. Usually it is `-D' like in `-DDEBUG'.
#
D := -D
@@ -55,7 +57,7 @@ endif
# ANSIFLAGS: Put there the flags used to make your compiler ANSI-compliant.
#
-# LCC is pure ANSI anyway !!
+# LCC is pure ANSI anyway!
#
ANSIFLAGS :=
diff --git a/builds/detect.mk b/builds/detect.mk
index d34904a..d81b971 100644
--- a/builds/detect.mk
+++ b/builds/detect.mk
@@ -44,7 +44,7 @@ ifndef TOP
endif
# Set auto-detection default to `ansi' resp. UNIX-like operating systems.
-# Note that we delay the evaluation of $(BUILD_CONFIG_), $(BUILD), and
+# Note that we delay evaluation of $(BUILD_CONFIG_), $(BUILD), and
# $(CONFIG_RULES).
#
PLATFORM := ansi
diff --git a/builds/dos/dos-def.mk b/builds/dos/dos-def.mk
index c0c49eb..a705562 100644
--- a/builds/dos/dos-def.mk
+++ b/builds/dos/dos-def.mk
@@ -1,3 +1,4 @@
+#
# Copyright 2000 David Turner <david.turner@freetype.org>
#
# DOS specific definitions
@@ -30,7 +31,7 @@ endif
# The directory where all library files are placed.
#
-# By default, this is the same as $(OBJ_DIR), however, this can be changed
+# By default, this is the same as $(OBJ_DIR); however, this can be changed
# to suit particular needs.
#
LIB_DIR := $(OBJ_DIR)
@@ -41,7 +42,7 @@ LIB_DIR := $(OBJ_DIR)
LIBRARY := $(PROJECT)
-# the NO_OUTPUT macro is used to ignore the output of commands
+# The NO_OUTPUT macro is used to ignore the output of commands.
#
NO_OUTPUT = &> nul
@@ -70,4 +71,4 @@ ifdef BUILD_PROJECT
endif
-
+# EOF
diff --git a/builds/freetype.mk b/builds/freetype.mk
index a1587a0..ab16bd5 100644
--- a/builds/freetype.mk
+++ b/builds/freetype.mk
@@ -105,6 +105,7 @@ LIB_ := $(LIB_DIR)$(SEP)
PUBLIC_ := $(TOP)$(SEP)include$(SEP)freetype$(SEP)
INTERNAL_ := $(PUBLIC_)internal$(SEP)
CONFIG_ := $(PUBLIC_)config$(SEP)
+CACHE_ := $(PUBLIC_)cache$(SEP)
# The final name of the library file.
@@ -145,8 +146,8 @@ OBJECTS_LIST :=
# Define $(PUBLIC_H) as the list of all public header files located in
-# `$(TOP)/include/freetype'. $(BASE_H) and $(CONFIG_H) are defined
-# similarly.
+# `$(TOP)/include/freetype'. $(BASE_H), $(CACHE_H), and $(CONFIG_H) are
+# defined similarly.
#
# This is used to simplify the dependency rules -- if one of these files
# changes, the whole library is recompiled.
@@ -154,8 +155,9 @@ OBJECTS_LIST :=
PUBLIC_H := $(wildcard $(PUBLIC_)*.h)
BASE_H := $(wildcard $(INTERNAL_)*.h)
CONFIG_H := $(wildcard $(CONFIG_)*.h)
+CACHE_H := $(wildcard $(CACHE_)*.h)
-FREETYPE_H := $(PUBLIC_H) $(BASE_H) $(CONFIG_H)
+FREETYPE_H := $(PUBLIC_H) $(BASE_H) $(CONFIG_H) $(CACHE_H)
# ftsystem component
@@ -257,10 +259,12 @@ distclean_project_std: clean_project_std
# we are stuck with wildcards.
#
clean_project_dos:
- -$(DELETE) $(subst $(SEP),$(HOSTSEP),$(OBJ_))*.$O $(CLEAN) $(NO_OUTPUT)
+ -$(DELETE) $(subst $(SEP),$(HOSTSEP),$(OBJ_))*.$O \
+ $(CLEAN) $(NO_OUTPUT)
distclean_project_dos: clean_project_dos
- -$(DELETE) $(subst $(SEP),$(HOSTSEP),$(PROJECT_LIBRARY)) $(DISTCLEAN) $(NO_OUTPUT)
+ -$(DELETE) $(subst $(SEP),$(HOSTSEP),$(PROJECT_LIBRARY)) \
+ $(DISTCLEAN) $(NO_OUTPUT)
# Remove configuration file (used for distclean).
#
diff --git a/builds/os2/detect.mk b/builds/os2/detect.mk
index ed0f124..4e47576 100644
--- a/builds/os2/detect.mk
+++ b/builds/os2/detect.mk
@@ -59,4 +59,4 @@ ifeq ($(PLATFORM),ansi)
endif # test OS2_SHELL
endif # test PLATFORM
-#EOF
+# EOF
diff --git a/builds/os2/os2-def.mk b/builds/os2/os2-def.mk
index 20939b7..284aae7 100644
--- a/builds/os2/os2-def.mk
+++ b/builds/os2/os2-def.mk
@@ -1,3 +1,4 @@
+#
# Copyright 2000 David Turner <david.turner@freetype.org>
#
# OS/2 specific definitions
@@ -10,7 +11,7 @@ PLATFORM := os2
# except for GCC+emx on OS/2
ifndef SEP
-SEP := $(HOSTSEP)
+ SEP := $(HOSTSEP)
endif
@@ -30,7 +31,7 @@ endif
# The directory where all library files are placed.
#
-# By default, this is the same as $(OBJ_DIR), however, this can be changed
+# By default, this is the same as $(OBJ_DIR); however, this can be changed
# to suit particular needs.
#
LIB_DIR := $(OBJ_DIR)
@@ -41,7 +42,7 @@ LIB_DIR := $(OBJ_DIR)
LIBRARY := $(PROJECT)
-# the NO_OUTPUT macro is used to ignore the output of commands
+# The NO_OUTPUT macro is used to ignore the output of commands.
#
NO_OUTPUT = 2> nul
@@ -70,4 +71,4 @@ ifdef BUILD_LIBRARY
endif
-
+# EOF
diff --git a/builds/os2/os2-dev.mk b/builds/os2/os2-dev.mk
index 5d78053..56a1f6f 100644
--- a/builds/os2/os2-dev.mk
+++ b/builds/os2/os2-dev.mk
@@ -43,7 +43,7 @@ endif
# The directory where all library files are placed.
#
-# By default, this is the same as $(OBJ_DIR), however, this can be changed
+# By default, this is the same as $(OBJ_DIR); however, this can be changed
# to suit particular needs.
#
LIB_DIR := $(OBJ_DIR)
@@ -75,7 +75,7 @@ I := -I
# C flag used to define a macro before the compilation of a given source
-# object. Usually is `-D' like in `-DDEBUG'.
+# object. Usually it is `-D' like in `-DDEBUG'.
#
D := -D
diff --git a/builds/os2/os2-gcc.mk b/builds/os2/os2-gcc.mk
index 9694aee..7e57b60 100644
--- a/builds/os2/os2-gcc.mk
+++ b/builds/os2/os2-gcc.mk
@@ -41,7 +41,7 @@ endif
# The directory where all library files are placed.
#
-# By default, this is the same as $(OBJ_DIR), however, this can be changed
+# By default, this is the same as $(OBJ_DIR); however, this can be changed
# to suit particular needs.
#
LIB_DIR := $(OBJ_DIR)
@@ -53,6 +53,7 @@ LIB_DIR := $(OBJ_DIR)
O := o
SO := o
+
# The library file extension (for standard and static libraries). This can
# be .a, .lib, etc., depending on the platform.
#
@@ -73,7 +74,7 @@ I := -I
# C flag used to define a macro before the compilation of a given source
-# object. Usually is `-D' like in `-DDEBUG'.
+# object. Usually it is `-D' like in `-DDEBUG'.
#
D := -D
diff --git a/builds/toplevel.mk b/builds/toplevel.mk
index c9f9cc6..9411164 100644
--- a/builds/toplevel.mk
+++ b/builds/toplevel.mk
@@ -58,21 +58,21 @@ ifdef check_platform
all: setup
-ifdef USE_MODULES
- # If the module list $(MODULE_LIST) file is not present, generate it.
- #
- #modules: make_module_list setup
-endif
+ ifdef USE_MODULES
+ # If the module list $(MODULE_LIST) file is not present, generate it.
+ #
+ #modules: make_module_list setup
+ endif
include $(TOP)/builds/detect.mk
-ifdef USE_MODULES
- include $(TOP)/builds/modules.mk
+ ifdef USE_MODULES
+ include $(TOP)/builds/modules.mk
- ifeq ($(wildcard $(MODULE_LIST)),)
- setup: make_module_list
+ ifeq ($(wildcard $(MODULE_LIST)),)
+ setup: make_module_list
+ endif
endif
-endif
# 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
@@ -80,11 +80,11 @@ endif
# GNU make.
#
distclean:
- $(RM) builds/unix/config.cache
- $(RM) builds/unix/config.log
- $(RM) builds/unix/config.status
- $(RM) builds/unix/unix-def.mk
- $(RM) builds/unix/unix-cc.mk
+ $(RM) builds/unix/config.cache
+ $(RM) builds/unix/config.log
+ $(RM) builds/unix/config.status
+ $(RM) builds/unix/unix-def.mk
+ $(RM) builds/unix/unix-cc.mk
# IMPORTANT:
#
@@ -97,9 +97,9 @@ else
#
all: single
-ifdef USE_MODULES
- modules: make_module_list
-endif
+ ifdef USE_MODULES
+ modules: make_module_list
+ endif
BUILD_PROJECT := yes
include $(CONFIG_MK)
diff --git a/builds/unix/configure.in b/builds/unix/configure.in
index b477039..d6488e1 100644
--- a/builds/unix/configure.in
+++ b/builds/unix/configure.in
@@ -79,7 +79,7 @@ AC_CHECK_FUNCS(memcpy memmove)
AM_PROG_LIBTOOL
-dnl create the Unix-specific sub-Makefile `builds/unix/unix-def.mk'
+dnl create the Unix-specific sub-Makefiles `builds/unix/unix-def.mk'
dnl and 'builds/unix/unix-cc.mk' that will be used by the build system
dnl
AC_OUTPUT(unix-cc.mk:unix-cc.in unix-def.mk:unix-def.in)
diff --git a/builds/unix/detect.mk b/builds/unix/detect.mk
index 53624b1..85d7a22 100644
--- a/builds/unix/detect.mk
+++ b/builds/unix/detect.mk
@@ -24,14 +24,14 @@ ifeq ($(PLATFORM),ansi)
# If `devel' is the requested target, we use a special configuration
- # file named "unix-dev.mk". It disables optimization and libtool..
+ # file named `unix-dev.mk'. It disables optimization and libtool.
#
ifneq ($(findstring devel,$(MAKECMDGOALS)),)
CONFIG_FILE := unix-dev.mk
devel: setup
else
# If a Unix platform is detected, the configure script is called and
- # `unix.mk' is created.
+ # `unix-def.mk' together with `unix-cc.mk' is created.
#
# Arguments to `configure' should be in the CFG variable. Example:
#
diff --git a/builds/unix/ftconfig.in b/builds/unix/ftconfig.in
index f73804a..e9c567f 100644
--- a/builds/unix/ftconfig.in
+++ b/builds/unix/ftconfig.in
@@ -224,12 +224,16 @@
/* */
#ifdef __cplusplus
+#define LOCAL_VAR extern "C"
+
#define LOCAL_FUNC_X extern "C"
#define FT_CPLUSPLUS( x ) extern "C" x
#else
+#define LOCAL_VAR extern
+
#define LOCAL_FUNC_X static
#define FT_CPLUSPLUS( x ) x
diff --git a/builds/unix/install.mk b/builds/unix/install.mk
index e868aef..01e9a12 100644
--- a/builds/unix/install.mk
+++ b/builds/unix/install.mk
@@ -1,53 +1,51 @@
#
-# installation instructions for Unix systems
+# installation instructions for Unix systems --
# this file is FreeType-specific
#
- # Unix installation and deinstallation targets.
- install: $(PROJECT_LIBRARY)
- $(MKINSTALLDIRS) $(libdir) \
- $(includedir)/freetype/config \
- $(includedir)/freetype/internal \
- $(includedir)/freetype/cache
- $(LIBTOOL) --mode=install $(INSTALL) $(PROJECT_LIBRARY) $(libdir)
- -for P in $(PUBLIC_H) ; do \
- $(INSTALL_DATA) $$P $(includedir)/freetype ; \
- done
- -for P in $(BASE_H) ; do \
- $(INSTALL_DATA) $$P $(includedir)/freetype/internal ; \
- done
- -for P in $(CONFIG_H) ; do \
- $(INSTALL_DATA) $$P $(includedir)/freetype/config ; \
- done
- -for P in $(BASE_H) ; do \
- $(INSTALL_DATA) $$P $(includedir)/freetype/cache ; \
- done
-
- uninstall:
- -$(LIBTOOL) --mode=uninstall $(RM) $(libdir)/$(PROJECT_LIBRARY).$A
- -$(DELETE) $(includedir)/freetype/cache/*
- -$(DELDIR) $(includedir)/freetype/cache
- -$(DELETE) $(includedir)/freetype/config/*
- -$(DELDIR) $(includedir)/freetype/config
- -$(DELETE) $(includedir)/freetype/internal/*
- -$(DELDIR) $(includedir)/freetype/internal
- -$(DELETE) $(includedir)/freetype/*
- -$(DELDIR) $(includedir)/freetype
-
-
- # Unix cleaning and distclean rules.
- #
- clean_project_unix:
- -$(DELETE) $(BASE_OBJECTS) $(OBJ_M) $(OBJ_S)
- -$(DELETE) $(patsubst %.$O,%.$(SO),$(BASE_OBJECTS) $(OBJ_M) $(OBJ_S)) \
- $(CLEAN)
-
- distclean_project_unix: clean_project_unix
- -$(DELETE) $(PROJECT_LIBRARY)
- -$(DELETE) $(OBJ_DIR)/.libs/*
- -$(DELDIR) $(OBJ_DIR)/.libs
- -$(DELETE) *.orig *~ core *.core $(DISTCLEAN)
-
-
+# Unix installation and deinstallation targets.
+install: $(PROJECT_LIBRARY)
+ $(MKINSTALLDIRS) $(libdir) \
+ $(includedir)/freetype/config \
+ $(includedir)/freetype/internal \
+ $(includedir)/freetype/cache
+ $(LIBTOOL) --mode=install $(INSTALL) $(PROJECT_LIBRARY) $(libdir)
+ -for P in $(PUBLIC_H) ; do \
+ $(INSTALL_DATA) $$P $(includedir)/freetype ; \
+ done
+ -for P in $(BASE_H) ; do \
+ $(INSTALL_DATA) $$P $(includedir)/freetype/internal ; \
+ done
+ -for P in $(CONFIG_H) ; do \
+ $(INSTALL_DATA) $$P $(includedir)/freetype/config ; \
+ done
+ -for P in $(CACHE_H) ; do \
+ $(INSTALL_DATA) $$P $(includedir)/freetype/cache ; \
+ done
+
+uninstall:
+ -$(LIBTOOL) --mode=uninstall $(RM) $(libdir)/$(PROJECT_LIBRARY).$A
+ -$(DELETE) $(includedir)/freetype/cache/*
+ -$(DELDIR) $(includedir)/freetype/cache
+ -$(DELETE) $(includedir)/freetype/config/*
+ -$(DELDIR) $(includedir)/freetype/config
+ -$(DELETE) $(includedir)/freetype/internal/*
+ -$(DELDIR) $(includedir)/freetype/internal
+ -$(DELETE) $(includedir)/freetype/*
+ -$(DELDIR) $(includedir)/freetype
+
+
+# Unix cleaning and distclean rules.
+#
+clean_project_unix:
+ -$(DELETE) $(BASE_OBJECTS) $(OBJ_M) $(OBJ_S)
+ -$(DELETE) $(patsubst %.$O,%.$(SO),$(BASE_OBJECTS) $(OBJ_M) $(OBJ_S)) \
+ $(CLEAN)
+
+distclean_project_unix: clean_project_unix
+ -$(DELETE) $(PROJECT_LIBRARY)
+ -$(DELETE) $(OBJ_DIR)/.libs/*
+ -$(DELDIR) $(OBJ_DIR)/.libs
+ -$(DELETE) *.orig *~ core *.core $(DISTCLEAN)
# EOF
diff --git a/builds/unix/unix-cc.in b/builds/unix/unix-cc.in
index 3f6f27f..3aa0cd5 100644
--- a/builds/unix/unix-cc.in
+++ b/builds/unix/unix-cc.in
@@ -1,9 +1,10 @@
# template for Unix-specific compiler definitions
#
-CC := @CC@
+CC := @CC@
+
+LIBTOOL := $(BUILD)/libtool
-LIBTOOL := $(BUILD)/libtool
# The object file extension (for standard and static libraries). This can be
# .o, .tco, .obj, etc., depending on the platform.
@@ -11,6 +12,7 @@ LIBTOOL := $(BUILD)/libtool
O := lo
SO := o
+
# The library file extension (for standard and static libraries). This can
# be .a, .lib, etc., depending on the platform.
#
@@ -31,7 +33,7 @@ I := -I
# C flag used to define a macro before the compilation of a given source
-# object. Usually is `-D' like in `-DDEBUG'.
+# object. Usually it is `-D' like in `-DDEBUG'.
#
D := -D
@@ -76,3 +78,4 @@ LDFLAGS := @LDFLAGS@
LINK_LIBRARY = $(LIBTOOL) --mode=link $(CCraw) -o $@ $(OBJECTS_LIST) \
-rpath $(libdir) -version-info $(version_info)
+# EOF
diff --git a/builds/unix/unix-def.in b/builds/unix/unix-def.in
index 5286b82..12a1736 100644
--- a/builds/unix/unix-def.in
+++ b/builds/unix/unix-def.in
@@ -69,14 +69,14 @@ endif
# The directory where all library files are placed.
#
-# By default, this is the same as $(OBJ_DIR), however, this can be changed
+# By default, this is the same as $(OBJ_DIR); however, this can be changed
# to suit particular needs.
#
LIB_DIR := $(OBJ_DIR)
-# the NO_OUTPUT macro is appended to command lines in order to ignore
-# the output of some programs..
+# The NO_OUTPUT macro is appended to command lines in order to ignore
+# the output of some programs.
#
NO_OUTPUT := 2> /dev/null
diff --git a/builds/unix/unix.mk b/builds/unix/unix.mk
index d8b4714..540ebf8 100644
--- a/builds/unix/unix.mk
+++ b/builds/unix/unix.mk
@@ -31,3 +31,4 @@ endif
include $(TOP)/builds/unix/install.mk
+# EOF
diff --git a/builds/unix/unixddef.mk b/builds/unix/unixddef.mk
index f86f8d9..6ef0cbc 100644
--- a/builds/unix/unixddef.mk
+++ b/builds/unix/unixddef.mk
@@ -1,6 +1,6 @@
#
# FreeType 2 configuration rules templates for
-# developement under Unix with no configure (gcc only)
+# development under Unix with no configure script (gcc only)
#
# Copyright 1996-2000 by
@@ -12,16 +12,18 @@
# indicate that you have read the license and understand and accept it
# fully.
+
ifndef TOP
TOP := .
endif
TOP := $(shell cd $(TOP); pwd)
-DELETE := rm -f
-SEP := /
-HOSTSEP := $(SEP)
-BUILD := $(TOP)/builds/unix/devel # we use a special devel ftoption.h
-PLATFORM := unixdev # do not set it to 'unix', or libtool will trick you
+DELETE := rm -f
+SEP := /
+HOSTSEP := $(SEP)
+BUILD := $(TOP)/builds/unix/devel # we use a special devel ftoption.h
+PLATFORM := unixdev # do not set it to `unix', or libtool will trick you
+
# The directory where all object files are placed.
#
@@ -29,17 +31,20 @@ ifndef OBJ_DIR
OBJ_DIR := $(shell cd $(TOP)/obj; pwd)
endif
+
# library file name
#
LIBRARY := lib$(PROJECT)
+
# The directory where all library files are placed.
#
-# By default, this is the same as $(OBJ_DIR), however, this can be changed
+# By default, this is the same as $(OBJ_DIR); however, this can be changed
# to suit particular needs.
#
LIB_DIR := $(OBJ_DIR)
+
#
NO_OUTPUT := 2> /dev/null
diff --git a/builds/win32/w32-lcc.mk b/builds/win32/w32-lcc.mk
index 7883bf8..731b7c6 100644
--- a/builds/win32/w32-lcc.mk
+++ b/builds/win32/w32-lcc.mk
@@ -2,7 +2,6 @@
# Configuration rules for Win32 + LCC
#
-
SEP := /
include $(TOP)/builds/win32/win32-def.mk
include $(TOP)/builds/compiler/win-lcc.mk
diff --git a/builds/win32/w32-vcc.mk b/builds/win32/w32-vcc.mk
index 3404e0b..6e6e595 100644
--- a/builds/win32/w32-vcc.mk
+++ b/builds/win32/w32-vcc.mk
@@ -1,5 +1,5 @@
#
-# Visual C++ on Win32
+# Visual C++ on Win32
#
SEP := /
diff --git a/builds/win32/win32-def.mk b/builds/win32/win32-def.mk
index 6a948ee..c31b5e8 100644
--- a/builds/win32/win32-def.mk
+++ b/builds/win32/win32-def.mk
@@ -12,7 +12,7 @@ PLATFORM := win32
# but certain compilers accept "/" as well
#
ifndef SEP
-SEP := $(HOSTSEP)
+ SEP := $(HOSTSEP)
endif
@@ -32,20 +32,20 @@ endif
# The directory where all library files are placed.
#
-# By default, this is the same as $(OBJ_DIR), however, this can be changed
+# By default, this is the same as $(OBJ_DIR); however, this can be changed
# to suit particular needs.
#
LIB_DIR := $(OBJ_DIR)
+
# The name of the final library file. Note that the DOS-specific Makefile
# uses a shorter (8.3) name.
#
LIBRARY := $(PROJECT)
-# the NO_OUTPUT macro is used to ignore the output of commands
+# The NO_OUTPUT macro is used to ignore the output of commands.
#
NO_OUTPUT = 2> nul
-
-
+# EOF