external/cde
1
0
Fork 0
mirror of git://git.code.sf.net/p/cdesktopenv/code synced 2025-03-09 15:50:02 +00:00
Code Issues Releases Wiki Activity

fontaliases: make it build, and rework somewhat

Browse source
This commit is contained in:
Jon Trulson 2019-11-21 19:47:38 -07:00
parent 5bb7b74efd
commit 70c07a7b68
18 changed files with 112 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

6
cde/.gitignore vendored
View file

@ -1207,11 +1207,17 @@ programs/dtwm/dtfplist
programs/dtwm/sys.dtwmrc
# programs/fontaliases
programs/fontaliases/bdf/dtinfo.pcf.gz
programs/fontaliases/linux/C/dtinfo.bdf
programs/fontaliases/linux/C/dtinfo.pcf
programs/fontaliases/linux/C/dtinfo.pcf.gz
programs/fontaliases/linux/C/dtinfo.pcf.Z
programs/fontaliases/linux/C/fonts.dir
programs/fontaliases/linux/en_US.UTF-8/dtinfo.bdf
programs/fontaliases/linux/en_US.UTF-8/dtinfo.pcf
programs/fontaliases/linux/en_US.UTF-8/dtinfo.pcf.gz
programs/fontaliases/linux/en_US.UTF-8/dtinfo.pcf.Z
programs/fontaliases/linux/en_US.UTF-8/fonts.dir
programs/fontaliases/freebsd/C/dtinfo.bdf
programs/fontaliases/freebsd/C/dtinfo.pcf
programs/fontaliases/freebsd/C/dtinfo.pcf.gz

19
cde/configure.ac
View file

@ -193,8 +193,11 @@ AM_CONDITIONAL([FRENCH], [test "build_french" = "yes"])
AC_ARG_ENABLE(spanish, --build-spanish Build Spanish (default=no)])
AM_CONDITIONAL([SPANISH], [test "build_spanish" = "yes"])
dnl hmmm...
RM="rm -f"
AC_SUBST(RM)
CP="cp -f"
AC_SUBST(CP)
dnl these should be configurable someday...
CDE_INSTALLATION_TOP="$ac_default_prefix"
@ -253,7 +256,7 @@ AC_PATH_PROG(XRDB, xrdb)
dnl programs
AC_CHECK_PROGS(BDFTOPCF, bdftopcf)
AC_CHECK_PROGS(MKFONTIDR, mkfontdir)
AC_CHECK_PROGS(MKFONTDIR, mkfontdir)
AC_CHECK_PROGS(GZIP, gzip)
AC_CHECK_PROGS(M4, m4)
AC_CHECK_PROGS(RPCGEN, rpcgen)
@ -434,6 +437,20 @@ programs/dtcreate/Makefile
programs/dtprintinfo/Makefile
programs/fontaliases/Makefile
programs/fontaliases/bdf/Makefile
programs/fontaliases/linux/Makefile
programs/fontaliases/linux/C/Makefile
programs/fontaliases/linux/en_US.UTF-8/Makefile
programs/fontaliases/sun/Makefile
programs/fontaliases/sun/C/Makefile
programs/fontaliases/netbsd/Makefile
programs/fontaliases/netbsd/C/Makefile
programs/fontaliases/openbsd/Makefile
programs/fontaliases/openbsd/C/Makefile
programs/fontaliases/freebsd/Makefile
programs/fontaliases/freebsd/C/Makefile
])
AC_OUTPUT

20
cde/programs/fontaliases/Makefile.am
View file

@ -1,29 +1,23 @@
MAINTAINERCLEANFILES = Makefile.in
SUBDIRS = bdf
if LINUX
SUBDIRS = linux
SUBDIRS += linux
endif
if SOLARIS
SUBDIRS = sun
SUBDIRS += sun
endif
if FREEBSD
SUBDIRS = freebsd
endif
if HPUX
SUBDIRS = hpux
endif
if AIX
SUBDIRS = ibm
SUBDIRS += freebsd
endif
if OPENBSD
SUBDIRS = openbsd
SUBDIRS += openbsd
endif
if NETBSD
SUBDIRS = netbsd
SUBDIRS += netbsd
endif

13
cde/programs/fontaliases/bdf/Makefile.am Normal file
View file

@ -0,0 +1,13 @@
MAINTAINERCLEANFILES = Makefile.in
noinst_DATA = $(DTINFO_FONT)
DTINFO_FONT = dtinfo.pcf.gz
BUILT_SOURCES = $(DTINFO_FONT)
CLEANFILES = $(BUILT_SOURCES)
dtinfo.pcf.gz: dtinfo.bdf
$(RM) $@
$(BDFTOPCF) -t $< |$(GZIP) > $@

10
cde/programs/fontaliases/bdf/fonts.inc Normal file
View file

@ -0,0 +1,10 @@
# to be included by OS/LANG/Makefile.am's
dtinfo.pcf.gz: $(top_builddir)/programs/fontaliases/bdf/dtinfo.pcf.gz
$(RM) $@
$(CP) $< $@
fonts.dir: fonts.alias dtinfo.pcf.gz
$(MKFONTDIR) .

8
cde/programs/fontaliases/freebsd/C/Makefile.am Normal file
View file

@ -0,0 +1,8 @@
MAINTAINERCLEANFILES = Makefile.in
noinst_DATA = fonts.dir
BUILT_SOURCES = fonts.dir dtinfo.pcf.gz
CLEANFILES = $(BUILT_SOURCES)
include $(top_builddir)/programs/fontaliases/bdf/fonts.inc

2
cde/programs/fontaliases/ibm/Makefile.am → cde/programs/fontaliases/freebsd/Makefile.am
View file

@ -1,3 +1,3 @@
MAINTAINERCLEANFILES = Makefile.in
SUBDIRS = C japanese
SUBDIRS = C

16
cde/programs/fontaliases/hp/C/Makefile.am
View file

@ -1,16 +0,0 @@
LOCAL_SRC = sys16.bdf sys26.bdf us12x23.bdf us6x13.bdf us8x16.bdf
sys17.bdf us11x19B.bdf us14x26B.bdf us6x14B.bdf us9x17B.bdf
sys13.bdf sys19.bdf us11x19.bdf us14x26.bdf us6x14.bdf us9x17.bdf
sys14.bdf sys23.bdf us12x23B.bdf us6x13B.bdf us8x16B.bdf
LOCAL_OBJS = sys16.pcf sys26.pcf us12x23.pcf us6x13.pcf us8x16.pcf
sys17.pcf us11x19B.pcf us14x26B.pcf us6x14B.pcf us9x17B.pcf
sys13.pcf sys19.pcf us11x19.pcf us14x26.pcf us6x14.pcf us9x17.pcf
sys14.pcf sys23.pcf us12x23B.pcf us6x13B.pcf us8x16B.pcf
ZIPPED_SRCS += sys16.pcf.gz sys26.pcf.gz us12x23.pcf.gz us6x13.pcf.gz us8x16.pcf.gz
sys17.pcf.gz us11x19B.pcf.gz us14x26B.pcf.gz us6x14B.pcf.gz us9x17B.pcf.gz
sys13.pcf.gz sys19.pcf.gz us11x19.pcf.gz us14x26.pcf.gz us6x14.pcf.gz us9x17.pcf.gz
sys14.pcf.gz sys23.pcf.gz us12x23B.pcf.gz us6x13B.pcf.gz us8x16B.pcf.gz
include ../../bdf/fonts.tmpl

1
cde/programs/fontaliases/hp/japanese/Makefile.am
View file

@ -1 +0,0 @@
include ../../bdf/fonts.tmpl

8
cde/programs/fontaliases/linux/C/Makefile.am Normal file
View file

@ -0,0 +1,8 @@
MAINTAINERCLEANFILES = Makefile.in
noinst_DATA = fonts.dir
BUILT_SOURCES = fonts.dir dtinfo.pcf.gz
CLEANFILES = $(BUILT_SOURCES)
include $(top_builddir)/programs/fontaliases/bdf/fonts.inc

8
cde/programs/fontaliases/linux/en_US.UTF-8/Makefile.am Normal file
View file

@ -0,0 +1,8 @@
MAINTAINERCLEANFILES = Makefile.in
noinst_DATA = fonts.dir
BUILT_SOURCES = fonts.dir dtinfo.pcf.gz
CLEANFILES = $(BUILT_SOURCES)
include $(top_builddir)/programs/fontaliases/bdf/fonts.inc

1
cde/programs/fontaliases/linux/en_US.UTF-8/fonts.dir
View file

@ -1 +0,0 @@
0

8
cde/programs/fontaliases/netbsd/C/Makefile.am Normal file
View file

@ -0,0 +1,8 @@
MAINTAINERCLEANFILES = Makefile.in
noinst_DATA = fonts.dir
BUILT_SOURCES = fonts.dir dtinfo.pcf.gz
CLEANFILES = $(BUILT_SOURCES)
include $(top_builddir)/programs/fontaliases/bdf/fonts.inc

3
cde/programs/fontaliases/netbsd/Makefile.am Normal file
View file

@ -0,0 +1,3 @@
MAINTAINERCLEANFILES = Makefile.in
SUBDIRS = C

8
cde/programs/fontaliases/openbsd/C/Makefile.am Normal file
View file

@ -0,0 +1,8 @@
MAINTAINERCLEANFILES = Makefile.in
noinst_DATA = fonts.dir
BUILT_SOURCES = fonts.dir dtinfo.pcf.gz
CLEANFILES = $(BUILT_SOURCES)
include $(top_builddir)/programs/fontaliases/bdf/fonts.inc

3
cde/programs/fontaliases/openbsd/Makefile.am Normal file
View file

@ -0,0 +1,3 @@
MAINTAINERCLEANFILES = Makefile.in
SUBDIRS = C

8
cde/programs/fontaliases/sun/C/Makefile.am Normal file
View file

@ -0,0 +1,8 @@
MAINTAINERCLEANFILES = Makefile.in
noinst_DATA = fonts.dir
BUILT_SOURCES = fonts.dir dtinfo.pcf.gz
CLEANFILES = $(BUILT_SOURCES)
include $(top_builddir)/programs/fontaliases/bdf/fonts.inc

3
cde/programs/fontaliases/sun/Makefile.am Normal file
View file

@ -0,0 +1,3 @@
MAINTAINERCLEANFILES = Makefile.in
SUBDIRS = C