diff options
| -rw-r--r-- | fontconfig/fc-arch/makefile | 6 | ||||
| -rw-r--r-- | fontconfig/fc-case/makefile | 4 | ||||
| -rw-r--r-- | fontconfig/fc-glyphname/makefile | 4 | ||||
| -rw-r--r-- | fontconfig/fc-lang/makefile | 4 | ||||
| -rw-r--r-- | fontconfig/src/makefile | 8 | ||||
| -rw-r--r-- | makefile.after | 18 |
6 files changed, 34 insertions, 10 deletions
diff --git a/fontconfig/fc-arch/makefile b/fontconfig/fc-arch/makefile index 1ab4d0b36..2f18dff42 100644 --- a/fontconfig/fc-arch/makefile +++ b/fontconfig/fc-arch/makefile @@ -1,3 +1,7 @@ +ifneq ($(NORELDBG),1) +$(error NORELDBG should have been set to 1) +endif + INCLUDES+=..\src TMPL=fcarch.tmpl.h @@ -12,7 +16,7 @@ CSRCS=fc-arch.c DEFINES += HAVE_CONFIG_H INCLUDES := .. $(INCLUDES) -$(TARG): $(OBJDIR)\fc-arch.exe $(STMPL) ${top_srcdir}/src/fcint.h ..\config.h +$(TARG): $(OBJDIR)\fc-arch.exe $(STMPL) ..\src\fcint.h ..\config.h del -e $(TARG) $(OBJDIR)\fc-arch.exe $(ARCHITECTURE) < $(STMPL) > $(TARG).tmp move $(TARG).tmp $(TARG) diff --git a/fontconfig/fc-case/makefile b/fontconfig/fc-case/makefile index 4d93e9171..804cd6910 100644 --- a/fontconfig/fc-case/makefile +++ b/fontconfig/fc-case/makefile @@ -1,3 +1,7 @@ +ifneq ($(NORELDBG),1) +$(error NORELDBG should have been set to 1) +endif + INCLUDES+=..\src TMPL=fccase.tmpl.h diff --git a/fontconfig/fc-glyphname/makefile b/fontconfig/fc-glyphname/makefile index 138c6e418..fca00db80 100644 --- a/fontconfig/fc-glyphname/makefile +++ b/fontconfig/fc-glyphname/makefile @@ -1,3 +1,7 @@ +ifneq ($(NORELDBG),1) +$(error NORELDBG should have been set to 1) +endif + INCLUDES+=..\src TMPL=fcglyphname.tmpl.h diff --git a/fontconfig/fc-lang/makefile b/fontconfig/fc-lang/makefile index f28fcda0d..3c212fe02 100644 --- a/fontconfig/fc-lang/makefile +++ b/fontconfig/fc-lang/makefile @@ -1,3 +1,7 @@ +ifneq ($(NORELDBG),1) +$(error NORELDBG should have been set to 1) +endif + INCLUDES+=..\src TMPL=fclang.tmpl.h diff --git a/fontconfig/src/makefile b/fontconfig/src/makefile index 4a9ac4dc1..61eb00cb9 100644 --- a/fontconfig/src/makefile +++ b/fontconfig/src/makefile @@ -9,10 +9,10 @@ # -DFC_CACHEDIR='"$(FC_CACHEDIR)"' \ # -DFONTCONFIG_PATH='"$(CONFDIR)"' -load_makefile DEBUG=0 ..\fc-arch\makefile -load_makefile DEBUG=0 ..\fc-case\makefile -load_makefile DEBUG=0 ..\fc-glyphname\makefile -load_makefile DEBUG=0 ..\fc-lang\makefile +load_makefile NORELDBG=1 ..\fc-arch\makefile +load_makefile NORELDBG=1 ..\fc-case\makefile +load_makefile NORELDBG=1 ..\fc-glyphname\makefile +load_makefile NORELDBG=1 ..\fc-lang\makefile CSRCS = \ fcatomic.c \ diff --git a/makefile.after b/makefile.after index 1ee5c0d2e..2ecf39423 100644 --- a/makefile.after +++ b/makefile.after @@ -79,7 +79,17 @@ COMMONCFLAGS += $(DEFINES:%=-D%) $(INCLUDES:%=-I%) -Fo$(relpath $@) -Fd"$(PDB)" #PDB= # There is no PDB file generated in a release build
endif
-.PHONY: all cleanall clean clean$(OBJDIRPREFIX)
+ifeq ($(OBJDIRPREFIX),)
+ifeq ($(DEBUG),1)
+CLEANRULEPOSTFIX=debug
+else
+CLEANRULEPOSTFIX=release
+endif
+else
+CLEANRULEPOSTFIX=$(OBJDIRPREFIX)
+endif
+
+.PHONY: all cleanall clean clean$(CLEANRULEPOSTFIX)
### Implicit rules ###
CREATEDIR=if not exist $@ mkdir $@
@@ -87,11 +97,9 @@ CREATEDIR=if not exist $@ mkdir $@ $(OBJDIR) :
$(CREATEDIR)
-ifneq ($(OBJDIRPREFIX),)
-clean: clean$(OBJDIRPREFIX)
-endif
+clean: clean$(CLEANRULEPOSTFIX)
-clean$(OBJDIRPREFIX):
+clean$(CLEANRULEPOSTFIX):
del -e $(OBJDIR)
$(OBJDIR)\%$(OBJEXT) : %.c
|