projects / oweals / cde.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 5bb7b74)
fontaliases: make it build, and rework somewhat
authorJon Trulson <jon@radscan.com>
Fri, 22 Nov 2019 02:47:38 +0000 (19:47 -0700)
committerJon Trulson <jon@radscan.com>
Fri, 22 Nov 2019 02:47:38 +0000 (19:47 -0700)
19 files changed:
cde/.gitignore patch | blob | history
cde/configure.ac patch | blob | history
cde/programs/fontaliases/Makefile.am patch | blob | history
cde/programs/fontaliases/bdf/Makefile.am [new file with mode: 0644] patch | blob
cde/programs/fontaliases/bdf/fonts.inc [new file with mode: 0644] patch | blob
cde/programs/fontaliases/freebsd/C/Makefile.am [new file with mode: 0644] patch | blob
cde/programs/fontaliases/freebsd/Makefile.am [new file with mode: 0644] patch | blob
cde/programs/fontaliases/hp/C/Makefile.am [deleted file] patch | blob | history
cde/programs/fontaliases/hp/japanese/Makefile.am [deleted file] patch | blob | history
cde/programs/fontaliases/ibm/Makefile.am [deleted file] patch | blob | history
cde/programs/fontaliases/linux/C/Makefile.am [new file with mode: 0644] patch | blob
cde/programs/fontaliases/linux/en_US.UTF-8/Makefile.am [new file with mode: 0644] patch | blob
cde/programs/fontaliases/linux/en_US.UTF-8/fonts.dir [deleted file] patch | blob | history
cde/programs/fontaliases/netbsd/C/Makefile.am [new file with mode: 0644] patch | blob
cde/programs/fontaliases/netbsd/Makefile.am [new file with mode: 0644] patch | blob
cde/programs/fontaliases/openbsd/C/Makefile.am [new file with mode: 0644] patch | blob
cde/programs/fontaliases/openbsd/Makefile.am [new file with mode: 0644] patch | blob
cde/programs/fontaliases/sun/C/Makefile.am [new file with mode: 0644] patch | blob
cde/programs/fontaliases/sun/Makefile.am [new file with mode: 0644] patch | blob

diff --git a/cde/.gitignore b/cde/.gitignore
index eddc0bfff8be550ad15bc66d85a5d671b4a84a08..faaf2db978e5060cee9a797c02925b15b3e9952d 100644 (file)
--- a/cde/.gitignore
+++ b/cde/.gitignore
@@ -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
diff --git a/cde/configure.ac b/cde/configure.ac
index 6c571fc816b169feae7efb05ad524c7bb4c8b53b..437d3da3814027b92143898067fb609425f1b022 100644 (file)
--- a/cde/configure.ac
+++ b/cde/configure.ac
@@ -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
diff --git a/cde/programs/fontaliases/Makefile.am b/cde/programs/fontaliases/Makefile.am
index ea7b68d75db428c251fd4f65d01e7b3c2b11755a..04eded0154951ac6f52a5e68328b70409c49dc5f 100644 (file)
--- a/cde/programs/fontaliases/Makefile.am
+++ b/cde/programs/fontaliases/Makefile.am
@@ -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
diff --git a/cde/programs/fontaliases/bdf/Makefile.am b/cde/programs/fontaliases/bdf/Makefile.am
new file mode 100644 (file)
index 0000000..a6aeb18
--- /dev/null
+++ b/cde/programs/fontaliases/bdf/Makefile.am
@@ -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) > $@
+
diff --git a/cde/programs/fontaliases/bdf/fonts.inc b/cde/programs/fontaliases/bdf/fonts.inc
new file mode 100644 (file)
index 0000000..630df8d
--- /dev/null
+++ b/cde/programs/fontaliases/bdf/fonts.inc
@@ -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) .
+
diff --git a/cde/programs/fontaliases/freebsd/C/Makefile.am b/cde/programs/fontaliases/freebsd/C/Makefile.am
new file mode 100644 (file)
index 0000000..04d85e6
--- /dev/null
+++ b/cde/programs/fontaliases/freebsd/C/Makefile.am
@@ -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
diff --git a/cde/programs/fontaliases/freebsd/Makefile.am b/cde/programs/fontaliases/freebsd/Makefile.am
new file mode 100644 (file)
index 0000000..55d3300
--- /dev/null
+++ b/cde/programs/fontaliases/freebsd/Makefile.am
@@ -0,0 +1,3 @@
+MAINTAINERCLEANFILES = Makefile.in
+
+SUBDIRS = C
diff --git a/cde/programs/fontaliases/hp/C/Makefile.am b/cde/programs/fontaliases/hp/C/Makefile.am
deleted file mode 100644 (file)
index d2f2306..0000000
--- a/cde/programs/fontaliases/hp/C/Makefile.am
+++ /dev/null
@@ -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
diff --git a/cde/programs/fontaliases/hp/japanese/Makefile.am b/cde/programs/fontaliases/hp/japanese/Makefile.am
deleted file mode 100644 (file)
index d13142e..0000000
--- a/cde/programs/fontaliases/hp/japanese/Makefile.am
+++ /dev/null
@@ -1 +0,0 @@
-include ../../bdf/fonts.tmpl
diff --git a/cde/programs/fontaliases/ibm/Makefile.am b/cde/programs/fontaliases/ibm/Makefile.am
deleted file mode 100644 (file)
index bee0975..0000000
--- a/cde/programs/fontaliases/ibm/Makefile.am
+++ /dev/null
@@ -1,3 +0,0 @@
-MAINTAINERCLEANFILES = Makefile.in
-
-SUBDIRS = C japanese
diff --git a/cde/programs/fontaliases/linux/C/Makefile.am b/cde/programs/fontaliases/linux/C/Makefile.am
new file mode 100644 (file)
index 0000000..04d85e6
--- /dev/null
+++ b/cde/programs/fontaliases/linux/C/Makefile.am
@@ -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
diff --git a/cde/programs/fontaliases/linux/en_US.UTF-8/Makefile.am b/cde/programs/fontaliases/linux/en_US.UTF-8/Makefile.am
new file mode 100644 (file)
index 0000000..04d85e6
--- /dev/null
+++ b/cde/programs/fontaliases/linux/en_US.UTF-8/Makefile.am
@@ -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
diff --git a/cde/programs/fontaliases/linux/en_US.UTF-8/fonts.dir b/cde/programs/fontaliases/linux/en_US.UTF-8/fonts.dir
deleted file mode 100644 (file)
index 573541a..0000000
--- a/cde/programs/fontaliases/linux/en_US.UTF-8/fonts.dir
+++ /dev/null
@@ -1 +0,0 @@
-0
diff --git a/cde/programs/fontaliases/netbsd/C/Makefile.am b/cde/programs/fontaliases/netbsd/C/Makefile.am
new file mode 100644 (file)
index 0000000..04d85e6
--- /dev/null
+++ b/cde/programs/fontaliases/netbsd/C/Makefile.am
@@ -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
diff --git a/cde/programs/fontaliases/netbsd/Makefile.am b/cde/programs/fontaliases/netbsd/Makefile.am
new file mode 100644 (file)
index 0000000..55d3300
--- /dev/null
+++ b/cde/programs/fontaliases/netbsd/Makefile.am
@@ -0,0 +1,3 @@
+MAINTAINERCLEANFILES = Makefile.in
+
+SUBDIRS = C
diff --git a/cde/programs/fontaliases/openbsd/C/Makefile.am b/cde/programs/fontaliases/openbsd/C/Makefile.am
new file mode 100644 (file)
index 0000000..04d85e6
--- /dev/null
+++ b/cde/programs/fontaliases/openbsd/C/Makefile.am
@@ -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
diff --git a/cde/programs/fontaliases/openbsd/Makefile.am b/cde/programs/fontaliases/openbsd/Makefile.am
new file mode 100644 (file)
index 0000000..55d3300
--- /dev/null
+++ b/cde/programs/fontaliases/openbsd/Makefile.am
@@ -0,0 +1,3 @@
+MAINTAINERCLEANFILES = Makefile.in
+
+SUBDIRS = C
diff --git a/cde/programs/fontaliases/sun/C/Makefile.am b/cde/programs/fontaliases/sun/C/Makefile.am
new file mode 100644 (file)
index 0000000..04d85e6
--- /dev/null
+++ b/cde/programs/fontaliases/sun/C/Makefile.am
@@ -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
diff --git a/cde/programs/fontaliases/sun/Makefile.am b/cde/programs/fontaliases/sun/Makefile.am
new file mode 100644 (file)
index 0000000..55d3300
--- /dev/null
+++ b/cde/programs/fontaliases/sun/Makefile.am
@@ -0,0 +1,3 @@
+MAINTAINERCLEANFILES = Makefile.in
+
+SUBDIRS = C
Unnamed repository; edit this file 'description' to name the repository.