shithub: equis

Info  •  Files  •  Log  •  Branches

lib: Simplify mkfile

--- a/sys/include/ape/ft2build.h

+++ b/sys/include/ape/ft2build.h

@@ -16,64 +16,64 @@

 #ifndef FT_CONFIG_CONFIG_H

-#define FT_CONFIG_CONFIG_H  "/sys/src/ape/lib/freetype/include/freetype/config/ftconfig.h"

+#define FT_CONFIG_CONFIG_H  "/sys/include/ape/freetype/config/ftconfig.h"

 #endif

 #ifndef FT_CONFIG_STANDARD_LIBRARY_H

-#define FT_CONFIG_STANDARD_LIBRARY_H  "/sys/src/ape/lib/freetype/include/freetype/config/ftstdlib.h"

+#define FT_CONFIG_STANDARD_LIBRARY_H  "/sys/include/ape/freetype/config/ftstdlib.h"

 #endif

 #ifndef FT_CONFIG_OPTIONS_H

-#define FT_CONFIG_OPTIONS_H  "/sys/src/ape/lib/freetype/include/freetype/config/ftoption.h"

+#define FT_CONFIG_OPTIONS_H  "/sys/include/ape/freetype/config/ftoption.h"

 #endif

 #ifndef FT_CONFIG_MODULES_H

-#define FT_CONFIG_MODULES_H  "/sys/src/ape/lib/freetype/include/freetype/config/ftmodule.h"

+#define FT_CONFIG_MODULES_H  "/sys/include/ape/freetype/config/ftmodule.h"

 #endif

-#define FT_FREETYPE_H  "/sys/src/ape/lib/freetype/include/freetype/freetype.h"

-#define FT_ERRORS_H  "/sys/src/ape/lib/freetype/include/freetype/fterrors.h"

-#define FT_MODULE_ERRORS_H  "/sys/src/ape/lib/freetype/include/freetype/ftmoderr.h"

-#define FT_SYSTEM_H  "/sys/src/ape/lib/freetype/include/freetype/ftsystem.h"

-#define FT_IMAGE_H  "/sys/src/ape/lib/freetype/include/freetype/ftimage.h"

-#define FT_TYPES_H  "/sys/src/ape/lib/freetype/include/freetype/fttypes.h"

-#define FT_LIST_H  "/sys/src/ape/lib/freetype/include/freetype/ftlist.h"

-#define FT_OUTLINE_H  "/sys/src/ape/lib/freetype/include/freetype/ftoutln.h"

-#define FT_SIZES_H  "/sys/src/ape/lib/freetype/include/freetype/ftsizes.h"

-#define FT_MODULE_H  "/sys/src/ape/lib/freetype/include/freetype/ftmodapi.h"

-#define FT_RENDER_H  "/sys/src/ape/lib/freetype/include/freetype/ftrender.h"

-#define FT_TYPE1_TABLES_H  "/sys/src/ape/lib/freetype/include/freetype/t1tables.h"

-#define FT_TRUETYPE_IDS_H  "/sys/src/ape/lib/freetype/include/freetype/ttnameid.h"

-#define FT_TRUETYPE_TABLES_H  "/sys/src/ape/lib/freetype/include/freetype/tttables.h"

-#define FT_TRUETYPE_TAGS_H  "/sys/src/ape/lib/freetype/include/freetype/tttags.h"

-#define FT_BDF_H  "/sys/src/ape/lib/freetype/include/freetype/ftbdf.h"

-#define FT_GZIP_H  "/sys/src/ape/lib/freetype/include/freetype/ftgzip.h"

-#define FT_LZW_H  "/sys/src/ape/lib/freetype/include/freetype/ftlzw.h"

-#define FT_WINFONTS_H   "/sys/src/ape/lib/freetype/include/freetype/ftwinfnt.h"

-#define FT_GLYPH_H  "/sys/src/ape/lib/freetype/include/freetype/ftglyph.h"

-#define FT_BITMAP_H  "/sys/src/ape/lib/freetype/include/freetype/ftbitmap.h"

-#define FT_BBOX_H  "/sys/src/ape/lib/freetype/include/freetype/ftbbox.h"

-#define FT_CACHE_H  "/sys/src/ape/lib/freetype/include/freetype/ftcache.h"

+#define FT_FREETYPE_H  "/sys/include/ape/freetype/freetype.h"

+#define FT_ERRORS_H  "/sys/include/ape/freetype/fterrors.h"

+#define FT_MODULE_ERRORS_H  "/sys/include/ape/freetype/ftmoderr.h"

+#define FT_SYSTEM_H  "/sys/include/ape/freetype/ftsystem.h"

+#define FT_IMAGE_H  "/sys/include/ape/freetype/ftimage.h"

+#define FT_TYPES_H  "/sys/include/ape/freetype/fttypes.h"

+#define FT_LIST_H  "/sys/include/ape/freetype/ftlist.h"

+#define FT_OUTLINE_H  "/sys/include/ape/freetype/ftoutln.h"

+#define FT_SIZES_H  "/sys/include/ape/freetype/ftsizes.h"

+#define FT_MODULE_H  "/sys/include/ape/freetype/ftmodapi.h"

+#define FT_RENDER_H  "/sys/include/ape/freetype/ftrender.h"

+#define FT_TYPE1_TABLES_H  "/sys/include/ape/freetype/t1tables.h"

+#define FT_TRUETYPE_IDS_H  "/sys/include/ape/freetype/ttnameid.h"

+#define FT_TRUETYPE_TABLES_H  "/sys/include/ape/freetype/tttables.h"

+#define FT_TRUETYPE_TAGS_H  "/sys/include/ape/freetype/tttags.h"

+#define FT_BDF_H  "/sys/include/ape/freetype/ftbdf.h"

+#define FT_GZIP_H  "/sys/include/ape/freetype/ftgzip.h"

+#define FT_LZW_H  "/sys/include/ape/freetype/ftlzw.h"

+#define FT_WINFONTS_H   "/sys/include/ape/freetype/ftwinfnt.h"

+#define FT_GLYPH_H  "/sys/include/ape/freetype/ftglyph.h"

+#define FT_BITMAP_H  "/sys/include/ape/freetype/ftbitmap.h"

+#define FT_BBOX_H  "/sys/include/ape/freetype/ftbbox.h"

+#define FT_CACHE_H  "/sys/include/ape/freetype/ftcache.h"

 #define FT_CACHE_IMAGE_H  FT_CACHE_H

 #define FT_CACHE_SMALL_BITMAPS_H  FT_CACHE_H

 #define FT_CACHE_CHARMAP_H  FT_CACHE_H

-#define FT_MAC_H  "/sys/src/ape/lib/freetype/include/freetype/ftmac.h"

-#define FT_MULTIPLE_MASTERS_H  "/sys/src/ape/lib/freetype/include/freetype/ftmm.h"

-#define FT_SFNT_NAMES_H  "/sys/src/ape/lib/freetype/include/freetype/ftsnames.h"

-#define FT_OPENTYPE_VALIDATE_H  "/sys/src/ape/lib/freetype/include/freetype/ftotval.h"

-#define FT_GX_VALIDATE_H  "/sys/src/ape/lib/freetype/include/freetype/ftgxval.h"

-#define FT_PFR_H  "/sys/src/ape/lib/freetype/include/freetype/ftpfr.h"

-#define FT_STROKER_H  "/sys/src/ape/lib/freetype/include/freetype/ftstroke.h"

-#define FT_SYNTHESIS_H  "/sys/src/ape/lib/freetype/include/freetype/ftsynth.h"

-#define FT_XFREE86_H  "/sys/src/ape/lib/freetype/include/freetype/ftxf86.h"

-#define FT_TRIGONOMETRY_H  "/sys/src/ape/lib/freetype/include/freetype/fttrigon.h"

-#define FT_LCD_FILTER_H  "/sys/src/ape/lib/freetype/include/freetype/ftlcdfil.h"

-#define FT_GASP_H  "/sys/src/ape/lib/freetype/include/freetype/ftgasp.h"

-#define FT_ERROR_DEFINITIONS_H  "/sys/src/ape/lib/freetype/include/freetype/fterrdef.h"

-#define FT_CACHE_MANAGER_H           "/sys/src/ape/lib/freetype/include/freetype/ftcache.h"

-#define FT_CACHE_INTERNAL_MRU_H      "/sys/src/ape/lib/freetype/include/freetype/ftcache.h"

-#define FT_CACHE_INTERNAL_MANAGER_H  "/sys/src/ape/lib/freetype/include/freetype/ftcache.h"

-#define FT_CACHE_INTERNAL_CACHE_H    "/sys/src/ape/lib/freetype/include/freetype/ftcache.h"

-#define FT_CACHE_INTERNAL_GLYPH_H    "/sys/src/ape/lib/freetype/include/freetype/ftcache.h"

-#define FT_CACHE_INTERNAL_IMAGE_H    "/sys/src/ape/lib/freetype/include/freetype/ftcache.h"

-#define FT_CACHE_INTERNAL_SBITS_H    "/sys/src/ape/lib/freetype/include/freetype/ftcache.h"

-#define FT_INCREMENTAL_H          "/sys/src/ape/lib/freetype/include/freetype/ftincrem.h"

-#define FT_TRUETYPE_UNPATENTED_H  "/sys/src/ape/lib/freetype/include/freetype/ttunpat.h"

+#define FT_MAC_H  "/sys/include/ape/freetype/ftmac.h"

+#define FT_MULTIPLE_MASTERS_H  "/sys/include/ape/freetype/ftmm.h"

+#define FT_SFNT_NAMES_H  "/sys/include/ape/freetype/ftsnames.h"

+#define FT_OPENTYPE_VALIDATE_H  "/sys/include/ape/freetype/ftotval.h"

+#define FT_GX_VALIDATE_H  "/sys/include/ape/freetype/ftgxval.h"

+#define FT_PFR_H  "/sys/include/ape/freetype/ftpfr.h"

+#define FT_STROKER_H  "/sys/include/ape/freetype/ftstroke.h"

+#define FT_SYNTHESIS_H  "/sys/include/ape/freetype/ftsynth.h"

+#define FT_XFREE86_H  "/sys/include/ape/freetype/ftxf86.h"

+#define FT_TRIGONOMETRY_H  "/sys/include/ape/freetype/fttrigon.h"

+#define FT_LCD_FILTER_H  "/sys/include/ape/freetype/ftlcdfil.h"

+#define FT_GASP_H  "/sys/include/ape/freetype/ftgasp.h"

+#define FT_ERROR_DEFINITIONS_H  "/sys/include/ape/freetype/fterrdef.h"

+#define FT_CACHE_MANAGER_H           "/sys/include/ape/freetype/ftcache.h"

+#define FT_CACHE_INTERNAL_MRU_H      "/sys/include/ape/freetype/ftcache.h"

+#define FT_CACHE_INTERNAL_MANAGER_H  "/sys/include/ape/freetype/ftcache.h"

+#define FT_CACHE_INTERNAL_CACHE_H    "/sys/include/ape/freetype/ftcache.h"

+#define FT_CACHE_INTERNAL_GLYPH_H    "/sys/include/ape/freetype/ftcache.h"

+#define FT_CACHE_INTERNAL_IMAGE_H    "/sys/include/ape/freetype/ftcache.h"

+#define FT_CACHE_INTERNAL_SBITS_H    "/sys/include/ape/freetype/ftcache.h"

+#define FT_INCREMENTAL_H          "/sys/include/ape/freetype/ftincrem.h"

+#define FT_TRUETYPE_UNPATENTED_H  "/sys/include/ape/freetype/ttunpat.h"

 #endif /* __FT2BUILD */

--- a/sys/src/ape/X11/lib/mkfile

+++ b/sys/src/ape/X11/lib/mkfile

@@ -1,5 +1,5 @@

 #DIRS=FS Xau Xdmcp Xext Xfont Xi fontenc pixman

-DIRS=`{ls -l | sed '/^d/!d; s/.* //; /\./d'}

+DIRS=`{echo */}

 default:V:	all

--- a/sys/src/ape/lib/freetype/mkfile

+++ b/sys/src/ape/lib/freetype/mkfile

@@ -54,7 +54,7 @@

 </sys/src/cmd/mksyslib

-CFLAGS=-c -Iinclude -DFT2_BUILD_LIBRARY

+CFLAGS=-c -Idevel -DFT2_BUILD_LIBRARY

 %.$O: %.c

 	$CC  $CFLAGS -o $stem.$O $stem.c

-- 

⑨