From bd547dc6e38cf5ff349379654eed90adc2bc5a17 Mon Sep 17 00:00:00 2001 From: Werner Lemberg Date: Fri, 22 Sep 2000 21:23:29 +0000 Subject: [PATCH] Clean up, formatting etc. Fixing rules for installing cache headers on Unix. Updating builds/unix/ftconfig.in. --- builds/ansi/ansi-def.mk | 4 +- builds/compiler/ansi-cc.mk | 3 +- builds/compiler/gcc-dev.mk | 10 +++-- builds/compiler/gcc.mk | 8 ++-- builds/compiler/visualage.mk | 3 ++ builds/compiler/visualc.mk | 5 ++- builds/compiler/win-lcc.mk | 6 ++- builds/detect.mk | 2 +- builds/dos/dos-def.mk | 7 +-- builds/freetype.mk | 14 +++--- builds/os2/detect.mk | 2 +- builds/os2/os2-def.mk | 9 ++-- builds/os2/os2-dev.mk | 4 +- builds/os2/os2-gcc.mk | 5 ++- builds/toplevel.mk | 36 ++++++++-------- builds/unix/configure.in | 2 +- builds/unix/detect.mk | 4 +- builds/unix/ftconfig.in | 4 ++ builds/unix/install.mk | 84 ++++++++++++++++++------------------ builds/unix/unix-cc.in | 9 ++-- builds/unix/unix-def.in | 6 +-- builds/unix/unix.mk | 1 + builds/unix/unixddef.mk | 19 +++++--- builds/win32/w32-lcc.mk | 1 - builds/win32/w32-vcc.mk | 2 +- builds/win32/win32-def.mk | 10 ++--- 26 files changed, 145 insertions(+), 115 deletions(-) diff --git a/builds/ansi/ansi-def.mk b/builds/ansi/ansi-def.mk index 4c40718a5..a20dbd30a 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 912d3b52c..6faeab196 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 d9d14cfbf..12ec3a637 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 ce92296eb..e1d4706ee 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 ec04c5fa4..7a745cfa2 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 2d50a7017..e0630b694 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 ba8e3790e..b73488295 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 d34904a37..d81b97170 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 c0c49eb6c..a70556284 100644 --- a/builds/dos/dos-def.mk +++ b/builds/dos/dos-def.mk @@ -1,3 +1,4 @@ +# # Copyright 2000 David Turner # # 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 a1587a066..ab16bd581 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 ed0f12493..4e4757613 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 20939b767..284aae780 100644 --- a/builds/os2/os2-def.mk +++ b/builds/os2/os2-def.mk @@ -1,3 +1,4 @@ +# # Copyright 2000 David Turner # # 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 5d78053a3..56a1f6f0b 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 9694aee27..7e57b60ee 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 c9f9cc651..9411164fd 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 b477039a3..d6488e1fd 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 53624b192..85d7a22e8 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 f73804a22..e9c567fc7 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 e868aefbd..01e9a12e7 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 +# 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 +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 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 3f6f27fb5..3aa0cd585 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 5286b829e..12a17366f 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 d8b4714c6..540ebf830 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 f86f8d950..6ef0cbc21 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 7883bf8e5..731b7c6f1 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 3404e0bd0..6e6e5954c 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 6a948ee87..c31b5e8cb 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