freetype-commit
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Git][freetype/freetype][master] * builds/toplevel.mk: Prefix all paths


From: Werner Lemberg (@wl)
Subject: [Git][freetype/freetype][master] * builds/toplevel.mk: Prefix all paths with `$(TOP_DIR)/`.
Date: Mon, 17 Oct 2022 06:51:48 +0000

Werner Lemberg pushed to branch master at FreeType / FreeType

Commits:

  • 8493877e
    by Xiang Xiao at 2022-10-17T08:49:53+02:00
    * builds/toplevel.mk: Prefix all paths with `$(TOP_DIR)/`.
    
    This is useful for builds that are not started from the root directory.
    
    Signed-off-by: Xiang Xiao <xiaoxiang@xiaomi.com>
    

1 changed file:

Changes:

  • builds/toplevel.mk
    ... ... @@ -139,12 +139,12 @@ ifdef check_platform
    139 139
       ifneq ($(is_unix),)
    
    140 140
     
    
    141 141
         distclean:
    
    142
    -	  $(RM) builds/unix/config.cache
    
    143
    -	  $(RM) builds/unix/config.log
    
    144
    -	  $(RM) builds/unix/config.status
    
    145
    -	  $(RM) builds/unix/unix-def.mk
    
    146
    -	  $(RM) builds/unix/unix-cc.mk
    
    147
    -	  $(RM) builds/unix/freetype2.pc
    
    142
    +	  $(RM) $(TOP_DIR)/builds/unix/config.cache
    
    143
    +	  $(RM) $(TOP_DIR)/builds/unix/config.log
    
    144
    +	  $(RM) $(TOP_DIR)/builds/unix/config.status
    
    145
    +	  $(RM) $(TOP_DIR)/builds/unix/unix-def.mk
    
    146
    +	  $(RM) $(TOP_DIR)/builds/unix/unix-cc.mk
    
    147
    +	  $(RM) $(TOP_DIR)/builds/unix/freetype2.pc
    
    148 148
     	  $(RM) nul
    
    149 149
     
    
    150 150
       endif # test is_unix
    
    ... ... @@ -170,17 +170,17 @@ endif # test check_platform
    170 170
     
    
    171 171
     check_out_submodule:
    
    172 172
     	$(info Checking out submodule in `subprojects/dlg')
    
    173
    -	git submodule init
    
    174
    -	git submodule update
    
    173
    +	git --git-dir=$(TOP_DIR) submodule init
    
    174
    +	git --git-dir=$(TOP_DIR) submodule update
    
    175 175
     
    
    176 176
     copy_submodule:
    
    177 177
     	$(info Copying files from `subprojects/dlg' to `src/dlg' and `include/dlg')
    
    178
    -  ifeq ($(wildcard include/dlg),)
    
    179
    -	mkdir $(subst /,$(SEP),include/dlg)
    
    178
    +  ifeq ($(wildcard $(TOP_DIR)/include/dlg),)
    
    179
    +	mkdir $(subst /,$(SEP),$(TOP_DIR)/include/dlg)
    
    180 180
       endif
    
    181
    -	$(COPY) $(subst /,$(SEP),subprojects/dlg/include/dlg/output.h include/dlg)
    
    182
    -	$(COPY) $(subst /,$(SEP),subprojects/dlg/include/dlg/dlg.h include/dlg)
    
    183
    -	$(COPY) $(subst /,$(SEP),subprojects/dlg/src/dlg/dlg.c src/dlg)
    
    181
    +	$(COPY) $(subst /,$(SEP),$(TOP_DIR)/subprojects/dlg/include/dlg/output.h $(TOP_DIR)/include/dlg)
    
    182
    +	$(COPY) $(subst /,$(SEP),$(TOP_DIR)/subprojects/dlg/include/dlg/dlg.h $(TOP_DIR)/include/dlg)
    
    183
    +	$(COPY) $(subst /,$(SEP),$(TOP_DIR)/subprojects/dlg/src/dlg/dlg.c $(TOP_DIR)/src/dlg)
    
    184 184
     
    
    185 185
     
    
    186 186
     # We always need the list of modules in ftmodule.h.
    
    ... ... @@ -294,15 +294,15 @@ CHANGELOG_SCRIPT = ~/git/config/gitlog-to-changelog
    294 294
     
    
    295 295
     do-dist: distclean refdoc
    
    296 296
     	@# Without removing the files, `autoconf' and friends follow links.
    
    297
    -	rm -f builds/unix/aclocal.m4
    
    298
    -	rm -f builds/unix/configure.ac
    
    299
    -	rm -f builds/unix/configure
    
    297
    +	rm -f $(TOP_DIR)/builds/unix/aclocal.m4
    
    298
    +	rm -f $(TOP_DIR)/builds/unix/configure.ac
    
    299
    +	rm -f $(TOP_DIR)/builds/unix/configure
    
    300 300
     
    
    301 301
     	sh autogen.sh
    
    302
    -	rm -rf builds/unix/autom4te.cache
    
    302
    +	rm -rf $(TOP_DIR)/builds/unix/autom4te.cache
    
    303 303
     
    
    304
    -	cp $(CONFIG_GUESS) builds/unix
    
    305
    -	cp $(CONFIG_SUB) builds/unix
    
    304
    +	cp $(CONFIG_GUESS) $(TOP_DIR)/builds/unix
    
    305
    +	cp $(CONFIG_SUB) $(TOP_DIR)/builds/unix
    
    306 306
     
    
    307 307
     	@# Generate `ChangeLog' file with commits since release 2.11.0
    
    308 308
     	@# (when we stopped creating this file manually).
    
    ... ... @@ -313,10 +313,10 @@ do-dist: distclean refdoc
    313 313
     	> ChangeLog
    
    314 314
     
    
    315 315
     	@# Remove intermediate files created by the `refdoc' target.
    
    316
    -	rm -rf docs/markdown
    
    317
    -	rm -f docs/mkdocs.yml
    
    316
    +	rm -rf $(TOP_DIR)/docs/markdown
    
    317
    +	rm -f $(TOP_DIR)/docs/mkdocs.yml
    
    318 318
     
    
    319 319
     	@# Remove more stuff related to git.
    
    320
    -	rm -rf subprojects/dlg
    
    320
    +	rm -rf (TOP_DIR)/subprojects/dlg
    
    321 321
     
    
    322 322
     # EOF


  • reply via email to

    [Prev in Thread] Current Thread [Next in Thread]