[Xorg-commit] xc/extras/freetype2/builds/os2 detect.mk,1.1,1.1.4.1 os2-def.mk,1.1.4.1,1.1.4.2 os2-dev.mk,1.1.4.1,1.1.4.2 os2-gcc.mk,1.1.4.1,1.1.4.2
Kaleb Keithley
xorg-commit at pdx.freedesktop.org
Wed May 9 17:30:30 EEST 2007
- Previous message: [Xorg-commit] xc/extras/freetype2/builds/beos beos-def.mk,1.1.4.1,1.1.4.2 beos.mk,1.1.4.1,1.1.4.2 detect.mk,1.1.4.1,1.1.4.2
- Next message: [Xorg-commit] xc/extras/freetype2/builds/unix .cvsignore,1.1.1.1.2.1,1.1.1.1.2.2 aclocal.m4,1.1.4.1,1.1.4.2 config.guess,1.1.4.1,1.1.4.2 config.sub,1.1.4.1,1.1.4.2 configure,1.1.4.1,1.1.4.2 configure.ac,1.1.4.1,1.1.4.2 detect.mk,1.1.4.1,1.1.4.2 freetype-config.in,1.1.4.1,1.1.4.2 freetype2.m4,1.1,1.1.4.1 ft-munmap.m4,1.1,1.1.4.1 ft2unix.h,1.1,1.1.4.1 ftconfig.in,1.1,1.1.4.1 install-sh,1.1.4.1,1.1.4.2 install.mk,1.1.4.1,1.1.4.2 ltmain.sh,1.1.4.1,1.1.4.2 mkinstalldirs,1.1.4.2,1.1.4.3 unix-cc.in,1.1.4.1,1.1.4.2 unix-def.in,1.1.4.1,1.1.4.2 unix-dev.mk,1.1.4.1,1.1.4.2 unix-lcc.mk,1.1.4.1,1.1.4.2 unixddef.mk,1.1.4.1,1.1.4.2
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Committed by: kaleb
Index: detect.mk
===================================================================
RCS file: /cvs/xorg/xc/extras/freetype2/builds/os2/detect.mk,v
retrieving revision 1.1
retrieving revision 1.1.4.1
diff -u -d -r1.1 -r1.1.4.1
--- a/detect.mk 14 Nov 2003 16:48:24 -0000 1.1
+++ b/detect.mk 23 Feb 2004 21:32:11 -0000 1.1.4.1
@@ -3,7 +3,7 @@
#
-# Copyright 1996-2000 by
+# Copyright 1996-2000, 2003 by
# David Turner, Robert Wilhelm, and Werner Lemberg.
#
# This file is part of the FreeType project, and may only be used, modified,
@@ -27,18 +27,17 @@
ifeq ($(PLATFORM),os2)
- COPY := copy
- DELETE := del
+ COPY := copy
+ DELETE := del
+ SEP := $(BACKSLASH)
# 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
@@ -46,7 +45,6 @@
ifneq ($(findstring watcom,$(MAKECMDGOALS)),) # Watcom C/C++
CONFIG_FILE := os2-wat.mk
- SEP := $(BACKSLASH)
CC := wcc386
watcom: setup
.PHONY: watcom
@@ -54,7 +52,6 @@
ifneq ($(findstring borlandc,$(MAKECMDGOALS)),) # Borland C++ 32-bit
CONFIG_FILE := os2-bcc.mk
- SEP := $(BACKSLASH)
CC := bcc32
borlandc: setup
.PHONY: borlandc
@@ -63,7 +60,6 @@
ifneq ($(findstring devel,$(MAKECMDGOALS)),) # development target
CONFIG_FILE := os2-dev.mk
CC := gcc
- SEP := /
devel: setup
.PHONY: devel
endif
@@ -72,4 +68,5 @@
endif # test PLATFORM os2
+
# EOF
Index: os2-def.mk
===================================================================
RCS file: /cvs/xorg/xc/extras/freetype2/builds/os2/os2-def.mk,v
retrieving revision 1.1.4.1
retrieving revision 1.1.4.2
diff -u -d -r1.1.4.1 -r1.1.4.2
--- a/os2-def.mk 26 Nov 2003 22:48:21 -0000 1.1.4.1
+++ b/os2-def.mk 23 Feb 2004 21:32:11 -0000 1.1.4.2
@@ -3,7 +3,7 @@
#
-# Copyright 1996-2000 by
+# Copyright 1996-2000, 2003 by
# David Turner, Robert Wilhelm, and Werner Lemberg.
#
# This file is part of the FreeType project, and may only be used, modified,
@@ -13,15 +13,10 @@
# fully.
-DELETE := del
-HOSTSEP := $(strip \ )
-BUILD := $(TOP_DIR)$(SEP)builds$(SEP)os2
-PLATFORM := os2
-
-# except for GCC+emx on OS/2
-ifndef SEP
- SEP := $(HOSTSEP)
-endif
+DELETE := del
+SEP := $(strip \ )
+BUILD_DIR := $(TOP_DIR)/builds/os2
+PLATFORM := os2
# The directory where all object files are placed.
@@ -34,7 +29,7 @@
# make -f %TOP_DIR%/Makefile
#
ifndef OBJ_DIR
- OBJ_DIR := $(TOP_DIR)$(SEP)objs
+ OBJ_DIR := $(TOP_DIR)/objs
endif
@@ -55,4 +50,5 @@
#
NO_OUTPUT = 2> nul
+
# EOF
Index: os2-dev.mk
===================================================================
RCS file: /cvs/xorg/xc/extras/freetype2/builds/os2/os2-dev.mk,v
retrieving revision 1.1.4.1
retrieving revision 1.1.4.2
diff -u -d -r1.1.4.1 -r1.1.4.2
--- a/os2-dev.mk 26 Nov 2003 22:48:21 -0000 1.1.4.1
+++ b/os2-dev.mk 23 Feb 2004 21:32:11 -0000 1.1.4.2
@@ -5,7 +5,7 @@
#
-# Copyright 1996-2000 by
+# Copyright 1996-2000, 2003 by
# David Turner, Robert Wilhelm, and Werner Lemberg.
#
# This file is part of the FreeType project, and may only be used, modified,
@@ -19,10 +19,8 @@
TOP_DIR := .
endif
-SEP := /
-
include $(TOP_DIR)/builds/os2/os2-def.mk
-BUILD := $(TOP_DIR)/builds/devel
+BUILD_DIR := $(TOP_DIR)/devel
include $(TOP_DIR)/builds/compiler/gcc-dev.mk
Index: os2-gcc.mk
===================================================================
RCS file: /cvs/xorg/xc/extras/freetype2/builds/os2/os2-gcc.mk,v
retrieving revision 1.1.4.1
retrieving revision 1.1.4.2
diff -u -d -r1.1.4.1 -r1.1.4.2
--- a/os2-gcc.mk 26 Nov 2003 22:48:21 -0000 1.1.4.1
+++ b/os2-gcc.mk 23 Feb 2004 21:32:11 -0000 1.1.4.2
@@ -13,8 +13,6 @@
# fully.
-SEP := /
-
# include OS/2-specific definitions
include $(TOP_DIR)/builds/os2/os2-def.mk
@@ -24,4 +22,5 @@
# include linking instructions
include $(TOP_DIR)/builds/link_dos.mk
+
# EOF
- Previous message: [Xorg-commit] xc/extras/freetype2/builds/beos beos-def.mk,1.1.4.1,1.1.4.2 beos.mk,1.1.4.1,1.1.4.2 detect.mk,1.1.4.1,1.1.4.2
- Next message: [Xorg-commit] xc/extras/freetype2/builds/unix .cvsignore,1.1.1.1.2.1,1.1.1.1.2.2 aclocal.m4,1.1.4.1,1.1.4.2 config.guess,1.1.4.1,1.1.4.2 config.sub,1.1.4.1,1.1.4.2 configure,1.1.4.1,1.1.4.2 configure.ac,1.1.4.1,1.1.4.2 detect.mk,1.1.4.1,1.1.4.2 freetype-config.in,1.1.4.1,1.1.4.2 freetype2.m4,1.1,1.1.4.1 ft-munmap.m4,1.1,1.1.4.1 ft2unix.h,1.1,1.1.4.1 ftconfig.in,1.1,1.1.4.1 install-sh,1.1.4.1,1.1.4.2 install.mk,1.1.4.1,1.1.4.2 ltmain.sh,1.1.4.1,1.1.4.2 mkinstalldirs,1.1.4.2,1.1.4.3 unix-cc.in,1.1.4.1,1.1.4.2 unix-def.in,1.1.4.1,1.1.4.2 unix-dev.mk,1.1.4.1,1.1.4.2 unix-lcc.mk,1.1.4.1,1.1.4.2 unixddef.mk,1.1.4.1,1.1.4.2
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the xorg-commit
mailing list