[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[freetype2-demos] master 83165e7 1/2: Move `obj' directory to `objs'.
From: |
Werner LEMBERG |
Subject: |
[freetype2-demos] master 83165e7 1/2: Move `obj' directory to `objs'. |
Date: |
Wed, 18 Apr 2018 03:21:37 -0400 (EDT) |
branch: master
commit 83165e71fca66e8b915909bfc739ed99ca16cfad
Author: Werner Lemberg <address@hidden>
Commit: Werner Lemberg <address@hidden>
Move `obj' directory to `objs'.
This is both for consistency with the FreeType library tree and
better jam support.
* Makefile (OBJ_DIR_2, clean_demo, distclean_demo), mac/Makefile
(OBJ_DIR_2), mac/ftoldmac.m68k_far.make.txt (ObjDir),
mac/ftoldmac.ppc_classic.make.txt (ObjDir), vms_make.com (OBJDIR,
grinit.obj, grx11.obj): Updated.
---
ChangeLog | 12 ++++++++++++
Makefile | 8 ++++----
mac/Makefile | 4 ++--
mac/ftoldmac.m68k_far.make.txt | 2 +-
mac/ftoldmac.ppc_classic.make.txt | 2 +-
{obj => objs}/.gitignore | 0
{obj => objs}/README | 0
vms_make.com | 6 +++---
8 files changed, 23 insertions(+), 11 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 452d8fd..b403085 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2018-04-17 Werner Lemberg <address@hidden>
+
+ Move `obj' directory to `objs'.
+
+ This is both for consistency with the FreeType library tree and
+ better jam support.
+
+ * Makefile (OBJ_DIR_2, clean_demo, distclean_demo), mac/Makefile
+ (OBJ_DIR_2), mac/ftoldmac.m68k_far.make.txt (ObjDir),
+ mac/ftoldmac.ppc_classic.make.txt (ObjDir), vms_make.com (OBJDIR,
+ grinit.obj, grx11.obj): Updated.
+
2018-01-26 Ben Wagner <address@hidden>
* src/ftmulti.c (LOG) [DEBUG]: Modernize.
diff --git a/Makefile b/Makefile
index cd32639..477980d 100644
--- a/Makefile
+++ b/Makefile
@@ -98,7 +98,7 @@ else
TOP_DIR_2 := $(shell cd $(TOP_DIR_2); pwd)
ifneq ($(have_makefile),)
BIN_DIR_2 ?= $(TOP_DIR_2)/bin
- OBJ_DIR_2 ?= $(TOP_DIR_2)/obj
+ OBJ_DIR_2 ?= $(TOP_DIR_2)/objs
else
BIN_DIR_2 ?= .
OBJ_DIR_2 ?= .
@@ -106,7 +106,7 @@ else
else
ifneq ($(have_makefile),)
BIN_DIR_2 ?= bin
- OBJ_DIR_2 ?= obj
+ OBJ_DIR_2 ?= objs
else
BIN_DIR_2 ?= .
OBJ_DIR_2 ?= .
@@ -221,11 +221,11 @@ else
ifdef DOSLIKE
clean_demo:
- -del obj\*.$(SO) 2> nul
+ -del objs\*.$(SO) 2> nul
-del $(subst /,\,$(TOP_DIR_2)/src/*.bak) 2> nul
distclean_demo: clean_demo
- -del obj\*.lib 2> nul
+ -del objs\*.lib 2> nul
-del bin\*.exe 2> nul
else
diff --git a/mac/Makefile b/mac/Makefile
index 02c2a6a..0d0018f 100644
--- a/mac/Makefile
+++ b/mac/Makefile
@@ -16,7 +16,7 @@ space := $(empty) $(empty)
TOP_DIR ?= ../../freetype2
OBJ_DIR ?= $(TOP_DIR)/objs
TOP_DIR_2 ?= ..
-OBJ_DIR_2 ?= $(TOP_DIR_2)/obj
+OBJ_DIR_2 ?= $(TOP_DIR_2)/objs
TOP_DIR_2_MAC ?= $(TOP_DIR_2)/mac
ifndef CONFIG_MK
@@ -40,7 +40,7 @@ else
TOP_DIR_2 := $(shell cd $(TOP_DIR_2); pwd)
ifneq ($(have_makefile),)
BIN_DIR_2 ?= $(TOP_DIR_2)/bin
- OBJ_DIR_2 ?= $(TOP_DIR_2)/obj
+ OBJ_DIR_2 ?= $(TOP_DIR_2)/objs
else
BIN_DIR_2 ?= ..
OBJ_DIR_2 ?= ..
diff --git a/mac/ftoldmac.m68k_far.make.txt b/mac/ftoldmac.m68k_far.make.txt
index fea9478..e7cd66f 100644
--- a/mac/ftoldmac.m68k_far.make.txt
+++ b/mac/ftoldmac.m68k_far.make.txt
@@ -7,7 +7,7 @@ MAKEFILE = ftoldmac.m68k_far.make
\xA5MondoBuild\xA5 = {MAKEFILE} # Make blank to avoid rebuilds when
makefile is modified
FT2Dir = ::freetype2:
-ObjDir = :obj:
+ObjDir = :objs:
Includes = \xB6
-i "{FT2Dir}include:" \xB6
-i "{FT2Dir}src:" \xB6
diff --git a/mac/ftoldmac.ppc_classic.make.txt
b/mac/ftoldmac.ppc_classic.make.txt
index 680528d..59d9d39 100644
--- a/mac/ftoldmac.ppc_classic.make.txt
+++ b/mac/ftoldmac.ppc_classic.make.txt
@@ -7,7 +7,7 @@ MAKEFILE = ftoldmac.ppc_classic.make
\xA5MondoBuild\xA5 = {MAKEFILE} # Make blank to avoid rebuilds when
makefile is modified
FT2Dir = ::freetype2:
-ObjDir = :obj:
+ObjDir = :objs:
Includes = \xB6
-i "{FT2Dir}include:" \xB6
-i "{FT2Dir}src:" \xB6
diff --git a/obj/.gitignore b/objs/.gitignore
similarity index 100%
rename from obj/.gitignore
rename to objs/.gitignore
diff --git a/obj/README b/objs/README
similarity index 100%
rename from obj/README
rename to objs/README
diff --git a/vms_make.com b/vms_make.com
index e23b2d0..da81792 100644
--- a/vms_make.com
+++ b/vms_make.com
@@ -94,7 +94,7 @@ CC = cc
SRCDIR = [.src]
GRAPHSRC = [.graph]
GRX11SRC = [.graph.x11]
-OBJDIR = [.obj]
+OBJDIR = [.objs]
# include paths
INCLUDES = /include=([-.freetype2.include],[.graph])
@@ -153,11 +153,11 @@ $(OBJDIR)gblender.obj : $(GRAPHSRC)gblender.c
$(OBJDIR)gblblit.obj : $(GRAPHSRC)gblblit.c
$(OBJDIR)grinit.obj : $(GRAPHSRC)grinit.c
set def $(GRAPHSRC)
- $(CC)$(CCOPT)/include=([.x11],[])/define=(DEVICE_X11)/obj=[-.obj]
grinit.c
+ $(CC)$(CCOPT)/include=([.x11],[])/define=(DEVICE_X11)/obj=[-.objs]
grinit.c
set def [-]
$(OBJDIR)grx11.obj : $(GRX11SRC)grx11.c
set def $(GRX11SRC)
- $(CC)$(CCOPT)/obj=[--.obj]/include=([-]) grx11.c
+ $(CC)$(CCOPT)/obj=[--.objs]/include=([-]) grx11.c
set def [--]
$(OBJDIR)grdevice.obj : $(GRAPHSRC)grdevice.c
$(OBJDIR)ftmulti.obj : $(SRCDIR)ftmulti.c
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [freetype2-demos] master 83165e7 1/2: Move `obj' directory to `objs'.,
Werner LEMBERG <=