summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Olbrich <m.olbrich@pengutronix.de>2018-10-03 11:09:26 +0200
committerMichael Olbrich <m.olbrich@pengutronix.de>2018-10-03 11:09:26 +0200
commiteeab9d7c831a02f3bfa14ef95b86c5c40e661379 (patch)
treee465f094f056c3d657d14b7e46e0cc06239a2d7b
parentd804983c09a9b25e92138653a717d104726ff4d5 (diff)
downloadptxdist-eeab9d7c831a02f3bfa14ef95b86c5c40e661379.tar.gz
ptxdist-eeab9d7c831a02f3bfa14ef95b86c5c40e661379.tar.xz
usplash: remove after one year in staging
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
l---------patches/usplash_0.5.49/autogen.sh1
-rw-r--r--patches/usplash_0.5.49/autotools.diff453
-rw-r--r--patches/usplash_0.5.49/cross-compile.diff138
-rw-r--r--patches/usplash_0.5.49/remove-old-buildsystem.diff1256
-rw-r--r--patches/usplash_0.5.49/series4
-rw-r--r--rules/host-usplash.in8
-rw-r--r--rules/host-usplash.make46
-rw-r--r--rules/usplash.in15
-rw-r--r--rules/usplash.make76
9 files changed, 0 insertions, 1997 deletions
diff --git a/patches/usplash_0.5.49/autogen.sh b/patches/usplash_0.5.49/autogen.sh
deleted file mode 120000
index 9f8a4cb7d..000000000
--- a/patches/usplash_0.5.49/autogen.sh
+++ /dev/null
@@ -1 +0,0 @@
-../autogen.sh \ No newline at end of file
diff --git a/patches/usplash_0.5.49/autotools.diff b/patches/usplash_0.5.49/autotools.diff
deleted file mode 100644
index 5a7f27ddf..000000000
--- a/patches/usplash_0.5.49/autotools.diff
+++ /dev/null
@@ -1,453 +0,0 @@
-From: Robert Schwebel <r.schwebel@pengutronix.de>
-Subject: [patch] add autotool based build system
-
-In order to be able to cross build usplash, add an autotools based build
-system.
-
-Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>
-
----
- Makefile.am | 50 ++++++++++++++
- autogen.sh | 22 ++++++
- bogl/Makefile.am | 92 +++++++++++++++++++++++++
- configure.ac | 170 ++++++++++++++++++++++++++++++++++++++++++++++++
- svgalib/Makefile.am | 3
- svgalib/gl/Makefile.am | 28 +++++++
- svgalib/src/Makefile.am | 35 +++++++++
- 7 files changed, 400 insertions(+)
-
-Index: b/bogl/Makefile.am
-===================================================================
---- /dev/null
-+++ b/bogl/Makefile.am
-@@ -0,0 +1,92 @@
-+
-+AM_CFLAGS = \
-+ -fPIC -I../
-+
-+lib_LTLIBRARIES = libbogl.la
-+bin_PROGRAMS = bdftobogl pngtobogl bterm reduce-font
-+EXTRA_PROGRAMS = bogl-test bowl-boxes
-+
-+LIBBOGLSOURCES = \
-+ bogl.c \
-+ bogl-font.c \
-+ bogl-cfb.c \
-+ bogl-pcfb.c \
-+ bogl-tcfb.c
-+
-+if BUILD_VGA16
-+LIBBOGLSOURCES += bogl-vga16.c
-+endif
-+
-+LIBBOMLSOURCES = \
-+ arrow.c \
-+ boml.c
-+
-+LIBBOWLSOURCES = \
-+ bowl.c \
-+ symbol.c
-+
-+LIBRSRCSOURCES = \
-+ helvB10.c \
-+ helvB12.c \
-+ helvR10.c \
-+ timBI18.c \
-+ tux75.c
-+
-+bdftobogl_SOURCES = \
-+ bdftobogl.c \
-+ $(LIBBOGLSOURCES)
-+
-+pngtobogl_SOURCES = \
-+ pngtobogl.c
-+
-+pngtobogl_CFLAGS = \
-+ $(libpng_CFLAGS)
-+
-+pngtobogl_LDADD = \
-+ -lgd -lm \
-+ $(libpng_LIBS)
-+
-+reduce_font_SOURCES = \
-+ reduce-font.c
-+
-+libbogl_la_SOURCES = \
-+ $(LIBBOGLSOURCES) \
-+ $(LIBBOMLSOURCES) \
-+ $(LIBBOWLSOURCES) \
-+ $(LIBRSRCSOURCES) \
-+ bowl-boxes.c
-+
-+libbogl_la_CFLAGS = $(AM_CFLAGS)
-+
-+bterm_SOURCES = \
-+ bterm.c \
-+ bogl-term.c \
-+ bogl-bgf.c
-+
-+bterm_LDADD = \
-+ .libs/libbogl.a
-+
-+bterm_DEPENDENCIES = \
-+ libbogl.la
-+
-+%.c: %.bdf bdftobogl
-+ ./bdftobogl $< > $@
-+
-+%.c: %.png pngtobogl
-+ ./pngtobogl $< > $@
-+
-+bogl_test_SOURCES = \
-+ bogl-test.c \
-+ tux75.c
-+
-+bogl_test_LDADD = \
-+ .libs/libbogl.a
-+
-+bogl_test_DEPENDENCIES = \
-+ libbogl.la
-+
-+
-+bowl_boxes_SOURCES = \
-+ $(libbogl_la_SOURCES)
-+
-+SUFFIXES: .png .bdf
-Index: b/Makefile.am
-===================================================================
---- /dev/null
-+++ b/Makefile.am
-@@ -0,0 +1,50 @@
-+
-+SUBDIRS = $(BACKEND_dir)
-+
-+sbin_PROGRAMS = usplash usplash_write
-+lib_LTLIBRARIES = libusplash.la
-+dist_sbin_SCRIPTS = usplash_down update-usplash-theme
-+
-+include_HEADERS = libusplash.h usplash-theme.h usplash_backend.h
-+noinst_HEADERS = usplash.h usplash_bogl_backend.h usplash_svga_backend.h
-+
-+AM_CFLAGS = \
-+ -fPIC \
-+ -Ibogl
-+
-+libusplash_la_SOURCES = \
-+ libusplash.c \
-+ usplash-testcard.c \
-+ usplash-testcard-theme.c \
-+ bogl/helvB10.c
-+
-+libusplash_la_LIBADD = \
-+ -ldl
-+
-+if SVGA_BACKEND
-+SUBDIRS += svgalib
-+libusplash_la_SOURCES += usplash_svga.c
-+libusplash_la_LIBADD += -lx86 svgalib/gl/libvgagl.a svgalib/src/libvga.a
-+AM_CFLAGS += -DSVGA
-+endif
-+
-+SUBDIRS += bogl
-+libusplash_la_SOURCES += usplash_bogl.c
-+libusplash_la_LIBADD += bogl/.libs/libbogl.a
-+
-+usplash_SOURCES = \
-+ usplash.c
-+
-+usplash_LDADD = \
-+ libusplash.la
-+
-+usplash_write_SOURCES = \
-+ usplash_write.c
-+
-+%.c: %.bdf
-+ ./bogl/bdftobogl $< > $@
-+
-+%.c: %.png
-+ ./bogl/pngtobogl $< > $@
-+
-+SUFFIXES: .png .bdf
-Index: b/configure.ac
-===================================================================
---- /dev/null
-+++ b/configure.ac
-@@ -0,0 +1,170 @@
-+# -*- Autoconf -*-
-+# Process this file with autoconf to produce a configure script.
-+AC_PREREQ(2.59)
-+
-+AC_INIT([usplash], [0.5.21], [bugs@pengutronix.de])
-+AC_CONFIG_SRCDIR([libusplash.c])
-+#AC_CONFIG_MACRO_DIR([config/m4])
-+#AC_CONFIG_AUX_DIR([config/autoconf])
-+AC_CANONICAL_BUILD
-+AC_CANONICAL_HOST
-+
-+AM_MAINTAINER_MODE
-+
-+CFLAGS="${CFLAGS} -Wall"
-+
-+#
-+# libtool library versioning stuff
-+#
-+# Library code modified: REVISION++
-+# Interfaces changed/added/removed: CURRENT++ REVISION=0
-+# Interfaces added: AGE++
-+# Interfaces removed: AGE=0
-+LT_CURRENT=0
-+LT_REVISION=0
-+LT_AGE=0
-+AC_SUBST(LT_CURRENT)
-+AC_SUBST(LT_REVISION)
-+AC_SUBST(LT_AGE)
-+
-+
-+#
-+# Checks for programs.
-+#
-+AC_PROG_CC
-+#AM_MISSING_PROG(PERL, perl, $missing_dir)
-+# libtool, old:
-+AC_LIBTOOL_WIN32_DLL
-+#AC_LIBTOOL_TAGS([])
-+AC_PROG_LIBTOOL
-+# libtool, new:
-+# LT_INIT(win32-dll)
-+
-+AM_INIT_AUTOMAKE([foreign no-exeext dist-bzip2])
-+
-+AC_DEFINE(BOGL_CFB_FB, 1, [Build cfb])
-+
-+case $host_cpu in
-+ i*86|arm*|x86_64|ia64)
-+ build_vga16="yes"
-+ AC_DEFINE(BOGL_VGA16_FB, 1, [Build vga16])
-+ ;;
-+ *)
-+ ;;
-+esac
-+
-+AM_CONDITIONAL(BUILD_VGA16, test "$build_vga16" = "yes")
-+
-+AC_MSG_CHECKING([whether to enable the SVGA backend])
-+AC_ARG_ENABLE(svga-backend,
-+ AS_HELP_STRING([--enable-svga-backend], [enable SVGA backend @<:@default=no@:>@]),
-+ [
-+ case "$enableval" in
-+ y | yes) CONFIG_SVGA=yes ;;
-+ *) CONFIG_SVGA=no ;;
-+ esac],
-+ [CONFIG_SVGA=no])
-+AC_MSG_RESULT([${CONFIG_SVGA}])
-+AM_CONDITIONAL(SVGA_BACKEND, test "$CONFIG_SVGA" = "yes")
-+
-+# FIXME:
-+AM_CONDITIONAL(NO_ASM, test false)
-+
-+#
-+# Checks for libraries.
-+#
-+
-+##
-+# libgd
-+##
-+AC_CHECK_LIB([gd], [gdImageCreate],
-+ libgd_LDFLAGS="-lgd"
-+ AC_SUBST(libgd_LDFLAGS),
-+ [AC_MSG_ERROR([cannot find/use libgd
-+ This drawing library can be downloaded at http://www.boutell.com/gd])])
-+AC_CHECK_HEADERS([gd.h],, [AC_MSG_ERROR([cannot find/use $ac_header])])
-+
-+##
-+# libpng
-+##
-+REQUIRES_LIBPNG="libpng"
-+AC_SUBST(REQUIRES_LIBPNG)
-+PKG_CHECK_MODULES([libpng],
-+ [${REQUIRES_LIBPNG}],
-+ [],
-+ [AC_MSG_ERROR([*** ${REQUIRES_LIBPNG} not found by pkg-config on your system])]
-+)
-+AC_SUBST(libpng_CFLAGS)
-+AC_SUBST(libpng_LIBS)
-+
-+#
-+# Checks for header files.
-+#
-+AC_HEADER_DIRENT
-+AC_HEADER_STDC
-+AC_HEADER_SYS_WAIT
-+AC_CHECK_HEADERS([ \
-+ arpa/inet.h \
-+ limits.h \
-+ netdb.h \
-+ netinet/in.h \
-+ stddef.h \
-+ stdlib.h \
-+ string.h \
-+ sys/param.h \
-+ sys/socket.h \
-+ sys/time.h \
-+ sys/un.h \
-+ unistd.h \
-+ utime.h \
-+ ])
-+
-+
-+#
-+# Checks for typedefs, structures, and compiler characteristics.
-+#
-+AC_C_CONST
-+AC_C_INLINE
-+AC_TYPE_SIZE_T
-+AC_HEADER_TIME
-+
-+
-+#
-+# Checks for library functions.
-+#
-+AC_FUNC_MEMCMP
-+AC_TYPE_SIGNAL
-+AC_FUNC_STAT
-+AC_FUNC_UTIME_NULL
-+AC_CHECK_FUNCS([gethostbyaddr gethostbyname gethostname gettimeofday memset mkdir socket utime])
-+
-+
-+#
-+# Debugging
-+#
-+AC_MSG_CHECKING([whether to enable debugging])
-+AC_ARG_ENABLE(debug,
-+ AS_HELP_STRING([--enable-debug], [enable debugging @<:@default=yes@:>@]),
-+ [case "$enableval" in
-+ y | yes) CONFIG_DEBUG=yes ;;
-+ *) CONFIG_DEBUG=no ;;
-+ esac],
-+ [CONFIG_DEBUG=yes])
-+AC_MSG_RESULT([${CONFIG_DEBUG}])
-+if test "${CONFIG_DEBUG}" = "yes"; then
-+ CFLAGS="${CFLAGS} -Wsign-compare -Wfloat-equal -Wformat-security -g -O1"
-+ AC_DEFINE(DEBUG, 1, [debugging])
-+else
-+ CFLAGS="${CFLAGS} -O2"
-+fi
-+
-+
-+AC_CONFIG_FILES([
-+ Makefile
-+ bogl/Makefile
-+ svgalib/Makefile
-+ svgalib/src/Makefile
-+ svgalib/gl/Makefile
-+ ])
-+AC_OUTPUT
-+
-Index: b/autogen.sh
-===================================================================
---- /dev/null
-+++ b/autogen.sh
-@@ -0,0 +1,22 @@
-+#!/bin/bash
-+
-+#
-+# usage:
-+#
-+# banner <target name>
-+#
-+banner() {
-+ echo
-+ TG=`echo $1 | sed -e "s,/.*/,,g"`
-+ LINE=`echo $TG |sed -e "s/./-/g"`
-+ echo $LINE
-+ echo $TG
-+ echo $LINE
-+ echo
-+}
-+
-+banner "autoreconf"
-+
-+autoreconf --force --install --symlink -Wall || exit $?
-+
-+banner "Finished"
-Index: b/svgalib/gl/Makefile.am
-===================================================================
---- /dev/null
-+++ b/svgalib/gl/Makefile.am
-@@ -0,0 +1,28 @@
-+
-+noinst_LIBRARIES = libvgagl.a
-+
-+libvgagl_a_CFLAGS = \
-+ -I$(srcdir)/../src/ \
-+ -fPIC
-+
-+libvgagl_a_CPPFLAGS = \
-+ -DNO_ASSEMBLY
-+
-+libvgagl_a_SOURCES = \
-+ cbitmap.c \
-+ driver.c \
-+ font8x8.c \
-+ grlib.c \
-+ line.c \
-+ palette.c \
-+ scale.c \
-+ mem.c \
-+ text.c
-+
-+# FIXME:
-+#if NO_ASM
-+#libvgagl_a_SOURCES += mem.c
-+#else
-+#libvgagl_a_SOURCES += mem.S
-+#endif
-+
-Index: b/svgalib/src/Makefile.am
-===================================================================
---- /dev/null
-+++ b/svgalib/src/Makefile.am
-@@ -0,0 +1,35 @@
-+
-+noinst_LIBRARIES = libvga.a
-+
-+libvga_a_SOURCES = \
-+ accel.c \
-+ interface.c \
-+ modetab.c \
-+ timing.c \
-+ vesa.c \
-+ vga.c \
-+ vgaaccel.c \
-+ vgabgpage.c \
-+ vgabgvt.c \
-+ vgaclear.c \
-+ vgacol.c \
-+ vgaconvplanar.c \
-+ vgadraw.c \
-+ vgadrv.c \
-+ vgadump.c \
-+ vgaline.c \
-+ vgamisc.c \
-+ vgamodesel.c \
-+ vgapal.c \
-+ vgapci.c \
-+ vgapix.c \
-+ vgaregs.c
-+
-+libvga_a_CPPFLAGS = \
-+ -DINCLUDE_VESA_DRIVER \
-+ -DNO_ASSEMBLY \
-+ -DSVGALIB_CONFIG_FILE=\"/etc/vga/libvga.config\"
-+
-+libvga_a_CFLAGS = \
-+ -fPIC
-+
-Index: b/svgalib/Makefile.am
-===================================================================
---- /dev/null
-+++ b/svgalib/Makefile.am
-@@ -0,0 +1,3 @@
-+
-+SUBDIRS = src gl
-+
diff --git a/patches/usplash_0.5.49/cross-compile.diff b/patches/usplash_0.5.49/cross-compile.diff
deleted file mode 100644
index e94f1e968..000000000
--- a/patches/usplash_0.5.49/cross-compile.diff
+++ /dev/null
@@ -1,138 +0,0 @@
-From: Robert Schwebel <r.schwebel@pengutronix.de>
-Subject: [patch] add config option for convert tools
-
-Add a configure option to enable the ???-to-usplash tools. When we cross
-build for embedded systems, we might want to disable these tools (they
-would have to be built for the "build" machine otherwhise).
-
-Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>
-
----
- Makefile.am | 12 ++++++++++--
- bogl/Makefile.am | 29 ++++++++++++++++++++---------
- configure.ac | 14 ++++++++++++++
- 3 files changed, 44 insertions(+), 11 deletions(-)
-
-Index: b/Makefile.am
-===================================================================
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -41,10 +41,18 @@ usplash_LDADD = \
- usplash_write_SOURCES = \
- usplash_write.c
-
-+if CONVERT_TOOLS
- %.c: %.bdf
-- ./bogl/bdftobogl $< > $@
-+ ./bogl/bdftousplash $< > $@
-
- %.c: %.png
-- ./bogl/pngtobogl $< > $@
-+ ./bogl/pngtousplash $< > $@
-+else
-+%.c: %.bdf
-+ bdftousplash $< > $@
-+
-+%.c: %.png
-+ pngtousplash $< > $@
-+endif
-
- SUFFIXES: .png .bdf
-Index: b/configure.ac
-===================================================================
---- a/configure.ac
-+++ b/configure.ac
-@@ -70,10 +70,23 @@ AM_CONDITIONAL(SVGA_BACKEND, test "$CONF
- # FIXME:
- AM_CONDITIONAL(NO_ASM, test false)
-
-+AC_MSG_CHECKING([whether to enable convert tools])
-+AC_ARG_ENABLE(convert-tools,
-+ AS_HELP_STRING([--disable-convert-tools], [disable convert tools]),
-+ [
-+ case "$enableval" in
-+ y | yes) CONFIG_TOOLS=yes ;;
-+ *) CONFIG_TOOLS=no ;;
-+ esac],
-+ [CONFIG_TOOLS=yes])
-+AC_MSG_RESULT([${CONFIG_TOOLS}])
-+AM_CONDITIONAL(CONVERT_TOOLS, test "$CONFIG_TOOLS" = "yes")
-+
- #
- # Checks for libraries.
- #
-
-+if test "$CONFIG_TOOLS" = "yes"; then
- ##
- # libgd
- ##
-@@ -96,6 +109,7 @@ PKG_CHECK_MODULES([libpng],
- )
- AC_SUBST(libpng_CFLAGS)
- AC_SUBST(libpng_LIBS)
-+fi
-
- #
- # Checks for header files.
-Index: b/bogl/Makefile.am
-===================================================================
---- a/bogl/Makefile.am
-+++ b/bogl/Makefile.am
-@@ -3,7 +3,10 @@ AM_CFLAGS = \
- -fPIC -I../
-
- lib_LTLIBRARIES = libbogl.la
--bin_PROGRAMS = bdftobogl pngtobogl bterm reduce-font
-+bin_PROGRAMS = bterm reduce-font
-+if CONVERT_TOOLS
-+bin_PROGRAMS += bdftousplash pngtousplash
-+endif
- EXTRA_PROGRAMS = bogl-test bowl-boxes
-
- LIBBOGLSOURCES = \
-@@ -32,17 +35,17 @@ LIBRSRCSOURCES = \
- timBI18.c \
- tux75.c
-
--bdftobogl_SOURCES = \
-+bdftousplash_SOURCES = \
- bdftobogl.c \
- $(LIBBOGLSOURCES)
-
--pngtobogl_SOURCES = \
-+pngtousplash_SOURCES = \
- pngtobogl.c
-
--pngtobogl_CFLAGS = \
-+pngtousplash_CFLAGS = \
- $(libpng_CFLAGS)
-
--pngtobogl_LDADD = \
-+pngtousplash_LDADD = \
- -lgd -lm \
- $(libpng_LIBS)
-
-@@ -69,11 +72,19 @@ bterm_LDADD = \
- bterm_DEPENDENCIES = \
- libbogl.la
-
--%.c: %.bdf bdftobogl
-- ./bdftobogl $< > $@
-+if CONVERT_TOOLS
-+%.c: %.bdf bdftousplash
-+ ./bdftousplash $< > $@
-+
-+%.c: %.png pngtousplash
-+ ./pngtousplash $< > $@
-+else
-+%.c: %.bdf
-+ bdftousplash $< > $@
-
--%.c: %.png pngtobogl
-- ./pngtobogl $< > $@
-+%.c: %.png
-+ pngtousplash $< > $@
-+endif
-
- bogl_test_SOURCES = \
- bogl-test.c \
diff --git a/patches/usplash_0.5.49/remove-old-buildsystem.diff b/patches/usplash_0.5.49/remove-old-buildsystem.diff
deleted file mode 100644
index dc314221c..000000000
--- a/patches/usplash_0.5.49/remove-old-buildsystem.diff
+++ /dev/null
@@ -1,1256 +0,0 @@
-From: Robert Schwebel <r.schwebel@pengutronix.de>
-Subject: [patch] remove old non-cross build system
-
-Remove the old build system which is not able to cross build the tools.
-This patch is a preparation for a next patch which adds an autotool
-based set of build scripts.
-
-Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>
-
----
- Makefile | 91 ----------
- bogl/Makefile | 120 -------------
- example-theme/Makefile | 29 ---
- svgalib/Makefile | 445 -------------------------------------------------
- svgalib/gl/Makefile | 78 --------
- svgalib/src/Makefile | 445 -------------------------------------------------
- 6 files changed, 1208 deletions(-)
-
-Index: b/Makefile
-===================================================================
---- a/Makefile
-+++ /dev/null
-@@ -1,91 +0,0 @@
--CC=gcc
--CFLAGS=-g -Wall -fPIC
--LDFLAGS=
--CPPFLAGS=-D_GNU_SOURCE
--INCLUDES=-Ibogl
--
--COMPILE = $(CC) $(CPPFLAGS) $(INCLUDES) $(CFLAGS)
--LINK = $(CC) $(CFLAGS) $(LDFLAGS)
--
--INSTALL = /usr/bin/install -c
--INSTALL_DATA = $(INSTALL) -m 644
--INSTALL_PROGRAM = $(INSTALL) -m 755
--
--
--TARGETS = usplash usplash_write
--
--usplash_BACKEND_LDFLAGS = -ldl
--
--ifeq ($(BACKEND), svga)
-- BACKEND_dir = bogl svgalib
-- usplash_BACKEND = usplash_svga.o usplash_bogl.o
-- usplash_BACKEND_LIBS = svgalib/staticlib/libvgagl.a svgalib/staticlib/libvga.a bogl/libbogl.a
-- usplash_BACKEND_LDFLAGS += -lx86
-- CFLAGS += -DSVGA
--else
-- BACKEND_dir = bogl
-- usplash_BACKEND = usplash_bogl.o
-- usplash_BACKEND_LIBS = bogl/libbogl.a
--endif
--
--all: $(BACKEND_dir) $(TARGETS)
--
--libusplash_OBJECTS = libusplash.o usplash-testcard.o usplash-testcard-theme.o $(usplash_BACKEND) bogl/helvB10.o
--usplash_LIBS =
--
--usplash: libusplash.so usplash.c
-- $(COMPILE) -c usplash.c -o usplash.o
-- $(LINK) -o $@ usplash.o -L. -lusplash
--
--libusplash.so.0: $(libusplash_OBJECTS) $(usplash_BACKEND_LIBS)
-- $(CC) -Wl,-soname=$@ -shared -o $@ $^ $(usplash_BACKEND_LDFLAGS)
--
--libusplash.so: libusplash.so.0
-- ln -sf $< $@
--
--usplash_write_OBJECTS = usplash_write.o
--
--usplash_write: $(usplash_write_OBJECTS)
-- $(LINK) -o $@ $^
--
--
--bogl:
-- $(MAKE) -C bogl
--
--svgalib:
-- $(MAKE) -C svgalib
--
--.c.o:
-- $(COMPILE) -o $@ -c $<
--
--.png.c:
-- ./bogl/pngtobogl $< > $@
--
--.bdf.c:
-- ./bogl/bdftobogl $< > $@
--
--
--install:
-- $(INSTALL) -d $(DESTDIR)/sbin $(DESTDIR)/usr/sbin $(DESTDIR)/lib $(DESTDIR)/usr/include $(DESTDIR)/usr/bin
-- $(INSTALL_PROGRAM) usplash $(DESTDIR)/sbin
-- $(INSTALL_PROGRAM) usplash_write $(DESTDIR)/sbin
-- $(INSTALL_PROGRAM) usplash_down $(DESTDIR)/sbin
-- $(INSTALL_PROGRAM) update-usplash-theme $(DESTDIR)/usr/sbin
-- $(INSTALL_PROGRAM) libusplash.so.0 $(DESTDIR)/lib/libusplash.so.0
-- ln -sf /lib/libusplash.so.0 $(DESTDIR)/lib/libusplash.so
-- $(INSTALL_PROGRAM) bogl/pngtobogl $(DESTDIR)/usr/bin/pngtousplash
-- $(INSTALL_PROGRAM) bogl/bdftobogl $(DESTDIR)/usr/bin/bdftousplash
-- $(INSTALL_DATA) usplash-theme.h $(DESTDIR)/usr/include/usplash-theme.h
-- $(INSTALL_DATA) usplash_backend.h $(DESTDIR)/usr/include/usplash_backend.h
-- $(INSTALL_DATA) libusplash.h $(DESTDIR)/usr/include/libusplash.h
--
--clean:
-- -$(MAKE) -C bogl clean
-- -$(MAKE) -C svgalib clean
-- -rm -f $(TARGETS) $(usplash_OBJECTS) $(usplash_write_OBJECTS) libusplash.so*
-- -rm -f *~
-- -rm -f *.o
--
--
--.PHONY: all bogl svgalib install clean
--.SUFFIXES: .png .bdf
-Index: b/bogl/Makefile
-===================================================================
---- a/bogl/Makefile
-+++ /dev/null
-@@ -1,120 +0,0 @@
--LIBS = -lc
--LIB = libbogl.a
--DEVLINK = libbogl.so
--SONAME = libbogl.so.0
--SHARED_LIB = libbogl.so.0.1
--
--CFLAGS = -O2 -g -D_GNU_SOURCE -fPIC -I../
--WARNCFLAGS += -Wall -D_GNU_SOURCE
--ALLCFLAGS = $(CFLAGS) $(WARNCFLAGS) $(FBCFLAGS)
--
--architecture := $(shell dpkg-architecture -qDEB_BUILD_ARCH_CPU)
--
--LIBOBJECTS = $(LIBBOGLOBJECTS) $(LIBBOMLOBJECTS) $(LIBBOWLOBJECTS) \
-- $(LIBRSRCOBJECTS)
--LIBBOGLOBJECTS = bogl.o bogl-font.o
--LIBBOMLOBJECTS = arrow.o boml.o
--LIBBOWLOBJECTS = bowl.o symbol.o
--LIBRSRCOBJECTS = helvB10.o helvB12.o helvR10.o timBI18.o tux75.o
--
--SOURCES_DEP = arrow.c bdftobogl.c bogl-cfb.c bogl-cfb.h bogl-cfb8.c \
--bogl-cfb8.h bogl-font.c bogl-font.h bogl-pcfb.c bogl-pcfb.h \
--bogl-tcfb.c bogl-tcfb.h bogl-test.c bogl.c bogl.h boglP.h boml.c \
--boml.h bowl-boxes.c bowl.c bowl.h pngtobogl.c
--
--ifeq (,)
-- FBCFLAGS += -DBOGL_CFB_FB=1
-- LIBBOGLOBJECTS += bogl-cfb.o bogl-pcfb.o bogl-tcfb.o
--endif
--
--ifneq (,$(filter i386 i486 arm ia64 amd64,$(architecture)))
-- FBCFLAGS += -DBOGL_VGA16_FB=1
-- LIBBOGLOBJECTS += bogl-vga16.o
-- SOURCES_DEP += bogl-vga16.c bogl-vga16.h
--endif
--
--OBJECTS = $(LIBOBJECTS) bowl-boxes.o
--
--GENERATED = helvB10.c helvB12.c helvR10.c timBI18.c tux75.c
--
--# libutf8/libutf8_plug.so unifont-reduced.bgf
--all: depend $(SHARED_LIB) $(LIB) bterm bdftobogl reduce-font
--
--%.lo: %.c
-- $(CC) $(ALLCFLAGS) -o $@ -fPIC -c $<
--
--%.o: %.c
-- $(CC) $(ALLCFLAGS) -o $@ -c $<
--
--$(SHARED_LIB): $(OBJECTS:%.o=%.lo)
-- $(CC) -shared -Wl,-soname,$(SONAME) -o $(SHARED_LIB) $(OBJECTS:%.o=%.lo)
--
--# unifont-reduced.bgf: bdftobogl unifont-reduced.bdf
--# ./bdftobogl -b unifont-reduced.bdf > unifont-reduced.bgf
--
--# unifont-reduced.bdf: ../bf-utf/unifont.bdf ../all.utf libutf8/libutf8_plug.so reduce-font
--# LD_PRELOAD=./libutf8/libutf8_plug.so LC_CTYPE=C.UTF-8 ./reduce-font $< < ../all.utf > $@
--
--# ../all.utf: ../po.utf ../rn.utf $(xml_files)
--# cat $^ > $@
--
--# ../po.utf:
--# $(MAKE) -C ../dbootstrap/po all-po-utf
--# cat ../dbootstrap/po/utf/*.po > $@
--
--# ../rn.utf:
--# $(MAKE) RN_TARGET_DIR=. -C ../../scripts/rootdisk/messages install-utf
--# cat ../../scripts/rootdisk/messages/release_notes.* > $@
--
--reduce-font: reduce-font.c
--
--$(LIB): $(OBJECTS)
-- rm -f $(LIB)
-- ar rcs $(LIB) $(OBJECTS)
--
--bogl-test: $(LIB) bogl-test.c tux75.o
-- $(CC) $(ALLCFLAGS) -o bogl-test bogl-test.c tux75.o $(LIB)
--
--bowl-boxes: $(LIB)
-- $(CC) -DSTANDALONE_TEST $(ALLCFLAGS) bowl-boxes.c $(LIBOBJECTS) -o bowl-boxes
--
--bterm: $(LIB) bterm.o bogl-term.o bogl-bgf.o
-- $(CC) $+ $(LIB) -o bterm
--
--bdftobogl: $(LIBBOGLOBJECTS)
--%.c: %.bdf bdftobogl
-- ./bdftobogl $< > $@
--
--pngtobogl: pngtobogl.o
-- $(CC) $(ALLCFLAGS) -o pngtobogl pngtobogl.o -lgd -lpng -lm
--%.c: %.png pngtobogl
-- ./pngtobogl $< > $@
--
--depend: .depend
--.depend: $(SOURCES_DEP)
-- $(CPP) $(ALLCFLAGS) -M $(SOURCES_DEP) > .depend
--
--clean:
-- rm -rf reduce-font bterm bdftobogl pngtobogl *.o $(GENERATED) *-test lang.h tmp.*.c bowl-boxes $(LIB) unifont-reduced.bgf unifont-reduced.bdf
-- rm -f $(OBJECTS:%.o=%.lo) $(SHARED_LIB)
-- rm -f .depend
--
--distclean: clean
-- rm -f $(LIB) .depend *~ .nfs*
--
--force:
--
--ifeq (.depend,$(wildcard .depend))
--include .depend
--endif
--
--install: all
-- install -d $(DESTDIR)/usr/lib $(DESTDIR)/usr/include/bogl $(DESTDIR)/usr/bin
-- install -m644 $(SHARED_LIB) $(DESTDIR)/usr/lib/$(SHARED_LIB)
-- ln -s $(SHARED_LIB) $(DESTDIR)/usr/lib/$(DEVLINK)
-- ln -s $(SHARED_LIB) $(DESTDIR)/usr/lib/$(SONAME)
-- install -m644 $(LIB) $(DESTDIR)/usr/lib/$(LIB)
-- install -m644 *.h $(DESTDIR)/usr/include/bogl
-- install -m755 bdftobogl mergebdf bterm pngtobogl reduce-font $(DESTDIR)/usr/bin
-- install -d $(DESTDIR)/usr/share/terminfo
-- tic -o$(DESTDIR)/usr/share/terminfo bterm.ti
-Index: b/example-theme/Makefile
-===================================================================
---- a/example-theme/Makefile
-+++ /dev/null
-@@ -1,29 +0,0 @@
--CC=gcc
--CFLAGS=-g -Wall -fPIC
--LDFLAGS=
--INCLUDES=
--
--COMPILE = $(CC) $(INCLUDES) $(CFLAGS)
--LINK = $(CC) $(CFLAGS) $(LDFLAGS)
--
--INSTALL = /usr/bin/install -c
--INSTALL_DATA = $(INSTALL) -m 644
--INSTALL_PROGRAM = $(INSTALL) -m 755
--
--eft-theme.so: eft_1024_576_cropped.png.c.o eft_1024_768.png.c.o eft_800_600.png.c.o throbber_fore.png.c.o throbber_back.png.c.o eft-theme.c.o helvB10.bdf.c.o
-- $(COMPILE) -shared -o $@ $^
--
--%.png.c: %.png
-- pngtousplash $< > $@
--
--%.bdf.c: %.bdf
-- bdftousplash $< > $@
--
--%.c.o: %.c
-- $(COMPILE) -o $@ -c $<
--
--install:
-- $(INSTALL) -d $(DESTDIR)/usr/lib/usplash
-- $(INSTALL_PROGRAM) eft-theme.so $(DESTDIR)/usr/lib/usplash/eft-theme.so
--clean:
-- rm -f *.png.c *.bdf.c *.c.o *.so
-Index: b/svgalib/Makefile
-===================================================================
---- a/svgalib/Makefile
-+++ /dev/null
-@@ -1,445 +0,0 @@
--#---------------------------------------------------------------------OU
--# Makefile for SVGAlib.
--#
--# It's pretty unreadable, but just doing make install should be
--# enough. This will install the headerfiles and shared library first
--# (which is enough to compile things), after which the static version is
--# optionally compiled and installed (if it fails, the shared libraries
--# should still work fine).
--#
--#----------------------------------------------------------------------
--
--# *** NO SERVICIBLE PARTS HERE!
--# All options are in Makefile.cfg.
--
--include Makefile.cfg
--
--#----------------------------------------------------------------------
--# Rules Section
--#----------------------------------------------------------------------
--
--JUMP_DIR=$(shell sh -c pwd)/jump/
--JUMP_LIB=libvga
--
--export JUMP_DIR
--export JUMP_LIB
--
--# Search the old directories for mkimage and mkstubs.
--# Make sure mkimage get the right "as" assembler.
--ifeq (a.out, $(TARGET_FORMAT))
-- PATH := /usr/i486-linuxaout/bin:$(PATH):/usr/dll/bin
-- export PATH
--endif
--
--# In case someone goes for the demos w/o installing svgalib make
--# the static libs first.
--ifdef INSTALLSHAREDLIB
-- PREDEMO =
--else
-- PREDEMO = static
--endif
--
--# A flag if this is a distribution:
--DISTRIBUTION = $(shell sh -c "echo sharedlib/DIST*")
--INSTALLAOUTDIR =
--
--ifeq (elf, $(TARGET_FORMAT))
--ifdef INSTALLAOUTLIB
--ifeq ($(DISTRIBUTION), sharedlib/DISTRIBUTION)
-- OBSOLETEAOUTDIRS = $(shell sed 's?\#.*$$??' /etc/ld.so.conf 2>/dev/null | \
-- sed 's?\([^/]\)[ ]*$$?\1/ ?' | grep aout/ )
-- INSTALLAOUTDIR = $(word 1, $(OBSOLETEAOUTDIRS))
--endif
--endif
--endif
--
--UTILS = restorefont runx restorepalette restoretextmode textmode \
-- savetextmode dumpreg fix132x43
--
--OBSOLETEHDIRS = /usr/include/ /usr/include/vga/ /usr/local/include/ /usr/local/include/vga/
--OBSOLETEBDIRS = /usr/bin/ /usr/local/bin/
--
--OBSOLETEHEADERS = /inc/vga.h /inc/vgakeyboard.h /inc/vgamouse.h /inc/vgagl.h /inc/vgajoystick.h
--
--OBSOLETELIBLINKS = /lib/libvga.so /lib/libvga.so.1 /lib/libvgagl.so /lib/libvgagl.so.1
--
--OBSOLETESHAREDIMAGES = /lib/libvgagl.so.* /lib/libvga.so.*
--
--ifeq (a.out, $(TARGET_FORMAT))
-- OBSOLETELDIRS = /lib/ /usr/lib/ /usr/local/lib/ /usr/share/lib/ \
-- $(shell sed 's?\#.*$$??' /etc/ld.so.conf 2>/dev/null | \
-- sed 's?\([^/]\)[ ]*$$?\1/ ?' )
-- SHAREDLIBS = sharedlib/libvga.so.$(VERSION)
-- SVGALIBSHAREDSTUBS = sharedlib/libvga.sa sharedlib/libvgagl.sa
-- JUMP = jump
--else
-- OBSOLETELDIRS = /lib/ /usr/lib/ /usr/local/lib/ /usr/share/lib/ \
-- $(shell sed 's?\#.*$$??' /etc/ld.so.conf 2>/dev/null | \
-- sed 's?\([^/]\)[ ]*$$?\1/ ?' | grep -v aout/ )
--
-- SHAREDAOUTLIBS = sharedlib/libvga.so.$(VERSION)
-- SVGALIBSHAREDAOUTSTUBS = sharedlib/libvga.sa sharedlib/libvgagl.sa
-- SHAREDLIBS = sharedlib/libvga.so.$(VERSION) sharedlib/libvgagl.so.$(VERSION)
-- SVGALIBSHAREDSTUBS =
-- JUMP =
--endif
--
--BACKUP = ../svgalib-$(VERSION).tar.gz
--
--default: static
--
--.PHONY: default all install installheaders installconfig
--.PHONY: clean distclean indent uninstall
--.PHONY: force_remake remake_shared shared static
--.PHONY: indent-gnu configaout
--
--installheaders:
-- @echo Installing header files in $(includedir).
-- mkdir -p $(includedir)
-- @cp $(srcdir)/src/vga.h $(includedir)/vga.h
-- @chmod a+r $(includedir)/vga.h
-- @cp $(srcdir)/gl/vgagl.h $(includedir)/vgagl.h
-- @chmod a+r $(includedir)/vgagl.h
-- @cp $(srcdir)/src/mouse/vgamouse.h $(includedir)/vgamouse.h
-- @chmod a+r $(includedir)/vgamouse.h
-- @cp $(srcdir)/src/joystick/vgajoystick.h $(includedir)/vgajoystick.h
-- @chmod a+r $(includedir)/vgajoystick.h
-- @cp $(srcdir)/src/keyboard/vgakeyboard.h $(includedir)/vgakeyboard.h
-- @chmod a+r $(includedir)/vgakeyboard.h
--
--installsharedlib: $(SHAREDLIBS) $(SVGALIBSHAREDSTUBS)
--ifeq (a.out, $(TARGET_FORMAT))
-- @echo Installing shared library stubs in $(libdir).
-- -@for foo in $(notdir $(SVGALIBSHAREDSTUBS)); do \
-- $(INSTALL_DATA) sharedlib/$$foo $(libdir)/$$foo; \
-- chmod a+r $(libdir)/$$foo; \
-- done
--endif
-- mkdir -p $(sharedlibdir)
-- @echo Installing shared library image as \
-- $(addprefix $(sharedlibdir)/,$(notdir $(SHAREDLIBS))).
-- @for foo in $(notdir $(SHAREDLIBS)); do \
-- $(INSTALL_SHLIB) sharedlib/$$foo $(sharedlibdir)/$$foo; \
-- cp -d sharedlib/`echo $$foo | sed 's/\.so\..*/.so/'` $(sharedlibdir); \
-- cp -d sharedlib/`echo $$foo | sed 's/\.so\..*/.so/'`.$(MAJOR_VER) $(sharedlibdir); \
-- done
--
--ifdef INSTALLAOUTDIR
--
--installaoutcompat:
-- @echo Installing shared a.out compatibility library in $(TOPDIR)/$(INSTALLAOUTDIR).
-- @for foo in $(notdir $(SVGALIBSHAREDAOUTSTUBS)); do \
-- $(INSTALL_DATA) sharedlib/$$foo $(TOPDIR)/$(INSTALLAOUTDIR)$$foo; \
-- done
-- @echo Installing shared a.out library compat image as \
-- $(addprefix $(INSTALLAOUTDIR),$(notdir $(SHAREDLIBS))).
-- @for foo in $(notdir $(SHAREDAOUTLIBS)); do \
-- $(INSTALL_SHLIB) sharedlib/$$foo $(TOPDIR)/$(INSTALLAOUTDIR)$$foo; \
-- cp -d sharedlib/`echo $$foo | sed 's/\.so\..*/.so/'` $(sharedlibdir); \
-- cp -d sharedlib/`echo $$foo | sed 's/\.so\..*/.so/'`.$(MAJOR_VER) $(sharedlibdir); \
-- done
--
--else
--
--installaoutcompat:
-- @true
--
--endif
--
--installstaticlib: static
-- @echo Installing static libraries in $(libdir).
-- @$(INSTALL_DATA) staticlib/libvga.a $(libdir)/libvga.a
-- @chmod a+r $(libdir)/libvga.a
-- @$(INSTALL_DATA) staticlib/libvgagl.a $(libdir)/libvgagl.a
-- @chmod a+r $(libdir)/libvgagl.a
--
--installutils: textutils lrmi
-- @if [ ! -d $(bindir) ]; then \
-- echo No $(bindir) directory, creating it.; \
-- mkdir $(bindir); \
-- fi
-- @echo Installing textmode utilities in $(bindir):
-- @echo "restorefont: Save/restore textmode font."
-- @cp utils/restorefont $(bindir)
-- @echo "restorepalette: Set standard VGA palette."
-- @cp utils/restorepalette $(bindir)
-- @echo "dumpreg: Write ASCII dump of SVGA registers."
-- @cp utils/dumpreg $(bindir)
-- @echo "restoretextmode: Save/restore textmode registers."
-- @cp utils/restoretextmode $(bindir)
-- @echo "textmode: Script that tries to restore textmode."
-- @cp utils/textmode $(bindir)
-- @echo "savetextmode: Script that saves textmode information used by 'textmode'."
-- @cp utils/savetextmode $(bindir)
-- @echo "mode3: Restore textmode by setting VESA mode 3."
-- @if [ -e lrmi-0.6m/mode3 ]; then cp lrmi-0.6m/mode3 $(bindir); fi
-- @echo "vga_reset: Restore textmode by resetting graphic board."
-- @if [ -e lrmi-0.6m/vga_reset ]; then cp lrmi-0.6m/vga_reset $(bindir); fi
-- @echo "Installing keymap utilities in $(bindir):"
-- @echo "svgakeymap: Perl script that generates scancode conversion maps."
-- @cp utils/svgakeymap $(bindir)
--
--installconfig:
-- @if [ ! -d $(datadir) ]; then \
-- echo Creating configuration directory $(datadir).; \
-- mkdir $(datadir); \
-- chmod go-w $(datadir); \
-- fi
-- @if [ \( -f /usr/local/lib/libvga.config -a ! -f $(datadir)/libvga.config \) ]; then \
-- echo "Moving old config file /usr/local/lib/libvga.config to $(datadir)." ; \
-- mv -f /usr/local/lib/libvga.config $(datadir)/libvga.config; \
-- fi
-- @if [ \( -f /usr/local/lib/libvga.et4000 -a ! -f $(datadir)/libvga.et4000 \) ]; then \
-- echo "Moving old config file /usr/local/lib/libvga.et4000 to $(datadir)." ; \
-- mv -f /usr/local/lib/libvga.et4000 $(datadir)/libvga.et4000; \
-- fi
-- @if [ \( -f /usr/local/lib/libvga.ega -a ! -f $(datadir)/libvga.ega \) ]; then \
-- echo "Moving old config file /usr/local/lib/libvga.ega to $(datadir)." ; \
-- mv -f /usr/local/lib/libvga.ega $(datadir)/libvga.ega; \
-- fi
-- @if [ \( -f /etc/mach32.eeprom -a ! -f $(datadir)/mach32.eeprom \) ]; then \
-- echo Consider moving your /etc/mach32.eeprom file to $(datadir) ; \
-- echo and changing $(datadir)/libvga.config appropriately. ; \
-- fi
-- @if [ ! -f $(datadir)/libvga.config ]; then \
-- echo Installing default configuration file in $(datadir).; \
-- cp $(confdir)/libvga.config $(datadir)/libvga.config; \
-- fi
-- @if [ ! -f $(datadir)/libvga.et4000 ]; then \
-- echo Installing dynamically loaded ET4000 registers in $(datadir).; \
-- cp $(confdir)/et4000.regs $(datadir)/libvga.et4000; \
-- fi
-- @if [ ! -f $(datadir)/default.keymap ]; then \
-- echo Installing default keymap file in $(datadir).; \
-- cp $(confdir)/default.keymap $(datadir)/null.keymap; \
-- fi
-- @if [ ! -f $(datadir)/dvorak-us.keymap ]; then \
-- echo Installing Dvorak keymap file in $(datadir).; \
-- cp $(confdir)/dvorak-us.keymap $(datadir)/dvorak-us.keymap; \
-- fi
--
--installman:
-- (cd doc; $(MAKE) -f $(srcdir)/doc/Makefile srcdir="$(srcdir)" install )
--
--install: uninstall $(INSTALLAOUTLIB) installheaders $(INSTALLSHAREDLIB) installconfig \
-- $(INSTALLSTATICLIB) $(INSTALLUTILS) $(INSTALLMAN)
-- @echo
-- @echo
-- @echo Now run "'make demoprogs'" to make the test and demo programs in
-- @echo demos/ and threedkit/.
--
--uninstall:
-- @echo "Removing textmode utilities..."
-- @for i in $(OBSOLETEBDIRS); do \
-- for prog in $(UTILS); do \
-- rm -f $$i$$prog ; \
-- done ; \
-- done
-- @echo "Removing shared library stubs (old & current)..."
-- @for i in $(OBSOLETELDIRS); do \
-- rm -f `echo /lib/libvga.so.$(VERSION) /lib/libvgagl.so.$(VERSION) \
-- $(OBSOLETELIBLINKS) /lib/libvga.sa /lib/libvgagl.sa \
-- | sed s?/lib/?$$i?g`; \
-- done
--ifndef KEEPSHAREDLIBS
-- @echo "Removing shared library images (old & current)..."
-- @for i in $(OBSOLETELDIRS); do \
-- rm -f `echo $(OBSOLETESHAREDIMAGES) | sed s?/lib/?$$i?g`; \
-- done
--endif
--ifneq ($(INSTALLAOUTDIR), )
-- @echo "Removing shared a.out library stubs (old & current)..."
-- @for i in $(OBSOLETEAOUTDIRS); do \
-- rm -f `echo /lib/libvga.so.$(VERSION) /lib/libvgagl.so.$(VERSION) \
-- $(OBSOLETELIBLINKS) /lib/libvga.sa /lib/libvgagl.sa \
-- | sed s?/lib/?$$i?g`; \
-- done
--ifndef KEEPSHAREDLIBS
-- @echo "Removing shared a.out library images (old & current)..."
-- @for i in $(OBSOLETEAOUTDIRS); do \
-- rm -f `echo $(OBSOLETESHAREDIMAGES) | sed s?/lib/?$$i?g`; \
-- done
--endif
--endif
-- @echo "Removing static libraries..."
-- @for i in $(OBSOLETELDIRS); do \
-- rm -f `echo /lib/libvga.a /lib/libvgagl.a | sed s?/lib/?$$i?g`; \
-- done
-- @echo "Removing header files..."
-- @for i in $(OBSOLETEHDIRS); do \
-- rm -f `echo $(OBSOLETEHEADERS) | sed s?/inc/?$$i?g`; \
-- done
-- (cd doc; $(MAKE) -f $(srcdir)/doc/Makefile srcdir="$(srcdir)" uninstall)
--
--
--SHAREDDIRS0 = sharedlib/mouse sharedlib/keyboard sharedlib/ramdac \
-- sharedlib/clockchip sharedlib/joystick sharedlib/x86emu
--SHAREDDIRS = $(SHAREDDIRS0) $(JUMP)
--STATICDIRS = staticlib/mouse staticlib/keyboard staticlib/ramdac \
-- staticlib/clockchip staticlib/joystick staticlib/x86emu
--UTILDIRS = utils
--DEMODIRS = demos threeDKit
--
--$(SHAREDDIRS0) $(STATICDIRS) $(DEMODIRS):
-- mkdir -p $@
--
--jump:
-- mkdir -p jump
-- if [ ! -f jump/jump.funcs ]; then \
-- cp $(srcdir)/jump/jump.funcs $(srcdir)/jump/jump.ignore \
-- $(srcdir)/jump/jump.vars jump; \
-- fi
--
--utils:
-- mkdir -p utils
-- if [ ! -f utils/runx ]; then \
-- cp $(srcdir)/utils/runx $(srcdir)/utils/savetextmode \
-- $(srcdir)/utils/textmode utils; \
-- fi
--
--static: staticlib/libvga.a staticlib/libvgagl.a
--
--.PHONY: staticlib/libvgagl.a staticlib/libvga.a
--
--staticlib/libvgagl.a staticlib/libvga.a: $(STATICDIRS)
-- (cd $(dir $@); \
-- $(MAKE) -f $(srcdir)/src/Makefile $(notdir $@) \
-- srcdir="$(srcdir)" DLLFLAGS="" \
-- )
--
--ifeq (a.out, $(TARGET_FORMAT))
--
--shared: force_remake $(SHAREDLIBS) $(SVGALIBSHAREDSTUBS)
--
--force_remake:
-- @if [ -f sharedlib/DISTRIBUTION ] ; then \
-- rm -f sharedlib/DISTRIBUTION ; \
-- $(MAKE) shared; \
-- fi
--
--sharedlib/libsources:
-- @mkdir -p sharedlib
-- @echo sharedlib/libvga.a sharedlib/libvgagl.a >sharedlib/libsources
--
--ifeq ($(DISTRIBUTION), sharedlib/DISTRIBUTION)
--
--sharedlib/libvga.so.$(VERSION):
-- @echo "Ooops, this shouldn\'t happen.. I\'m going to fix it..."
-- @rm -f sharedlib/DISTRIBUTION
-- @$(MAKE) sharedlib/libvga.so.$(VERSION)
--
--else
--
--sharedlib/libvga.so.$(VERSION): sharedlib/libvga.a sharedlib/libvgagl.a
-- (cd sharedlib; \
-- mkstubs -a 0x63b00000 -l libvga -v $(VERSION) -j 0x00001000 -g 4096 \
-- -- libvga; \
-- mkstubs -a 0x63b00000 -l libvga -v $(VERSION) -j 0x00001000 -g 4096 \
-- -- libvgagl; \
-- mkimage -a 0x63b00000 -l libvga -v $(VERSION) -j 0x00001000 -g 4096 \
-- -- $(MKIMAGEFLAGS) libvga.a libvgagl.a \
-- `$(CC) --print-libgcc-file-name` -lc -lm; \
-- strip libvga.so.$(VERSION) \
-- )
--
--endif # DISTRIBUTION
--
--sharedlib/libvga.a: $(SHAREDDIRS)
-- (cd $(dir $@); \
-- $(MAKE) -f $(srcdir)/src/Makefile $(notdir $@) \
-- srcdir="$(srcdir)" DLLFLAGS="$(DLLFLAGS)" \
-- )
--
--else
--
--# ELF
--
--.PHONY: sharedlib/libvga.so.$(VERSION) sharedlib/libvgagl.so.$(VERSION)
--
--shared: $(SHAREDLIBS) $(SVGALIBSHAREDSTUBS)
--
--sharedlib/libvga.so.$(VERSION): $(SHAREDDIRS)
-- @rm -f sharedlib/DISTRIBUTION
-- (cd $(dir $@); \
-- $(MAKE) -f $(srcdir)/src/Makefile $(notdir $@) \
-- srcdir="$(srcdir)" DLLFLAGS="$(DLLFLAGS)" \
-- )
--
--endif # a.out
--
--sharedlib/libvgagl.a sharedlib/libvgagl.so.$(VERSION): $(SHAREDDIRS)
-- (cd $(dir $@); \
-- $(MAKE) -f $(srcdir)/gl/Makefile $(notdir $@) \
-- srcdir="$(srcdir)" DLLFLAGS="$(DLLFLAGS)" \
-- )
--
--demoprogs: $(PREDEMO) $(DEMODIRS)
-- @for dir in $(DEMODIRS); do \
-- if [ -d $(srcdir)/$$dir ]; then \
-- (cd $$dir; \
-- $(MAKE) -f $(srcdir)/$$dir/Makefile srcdir="$(srcdir)"); \
-- fi; \
-- done
--
--textutils: $(UTILDIRS)
-- (cd utils; \
-- $(MAKE) -f $(srcdir)/utils/Makefile srcdir="$(srcdir)")
--
--lrmi:
--ifneq (y,$(NO_ASM))
-- (cd lrmi-0.6m;\
-- $(MAKE))
--endif
--
--backup: $(BACKUP)
--
--configaout:
-- @if grep '^TARGET_FORMAT = elf$$' $(srcdir)/Makefile.cfg >/dev/null; then \
-- $(MAKE) clean; \
-- sed 's/^TARGET_FORMAT = elf$$/# TARGET_FORMAT = elf/' \
-- $(srcdir)/Makefile.cfg | \
-- sed 's/^#[ ]*TARGET_FORMAT = a.out$$/TARGET_FORMAT = a.out/' \
-- > mkcfg ; \
-- mv mkcfg $(srcdir)/Makefile.cfg; \
-- echo "Was configured for elf, rerunning make"; \
-- $(MAKE) clean backup; \
-- echo "Ignore this error message:"; \
-- exit 1; \
-- fi
--
--$(BACKUP): configaout
--# I tried using a dependency, but make reordered them
--# thus I have to do it this way:
-- $(MAKE) shared
-- $(MAKE) distclean
--
-- sed 's/^TARGET_FORMAT = a.out$$/# TARGET_FORMAT = a.out/' \
-- $(srcdir)/Makefile.cfg | \
-- sed 's/^#[ ]*TARGET_FORMAT = elf$$/TARGET_FORMAT = elf/' \
-- > mkcfg ; \
-- mv mkcfg $(srcdir)/Makefile.cfg; \
-- (cd ..; \
-- find svgalib-$(VERSION) ! -type d -print | sort | tar -cvf- -T- ) \
-- | gzip -9 >$(BACKUP)
--
--distclean:
-- (cd $(srcdir)/src; $(MAKE) clean)
-- (cd $(srcdir)/gl; $(MAKE) clean)
-- find . \( -name '.depend*' -o -name '*~*' \) -exec rm {} \;
-- rm -rf sharedlib/[!l]* sharedlib/l[!i]* sharedlib/li[!b]* staticlib
-- rm -rf sharedlib/*.a
-- mkdir -p sharedlib
-- touch sharedlib/DISTRIBUTION
--
--clean: distclean
-- rm -rf sharedlib
--
--indent:
-- find demos gl mach src support -name '*.[ch]' -exec indent -kr {} \;
-- indent -kr src/*.regs
--
--indent-gnu:
-- find demos gl mach src support -name '*.[ch]' -exec indent -gnu {} \;
-- indent -gnu src/*.regs
--
--FORCE:
-Index: b/svgalib/gl/Makefile
-===================================================================
---- a/svgalib/gl/Makefile
-+++ /dev/null
-@@ -1,78 +0,0 @@
--#----------------------------------------------------------------------
--# Makefile for SVGAlib GL routines.
--#----------------------------------------------------------------------
--
--# *** NO SERVICIBLE PARTS HERE!
--# All options are in Makefile.cfg.
--
--include ../Makefile.cfg
--
--srcdir = ..
--VPATH = $(srcdir)/gl
--
--INCLUDES += -I$(srcdir)/src
--
--ifeq (a.out, $(TARGET_FORMAT))
-- DEFINES += -DSVGA_AOUT
--endif
--
--ifeq (y, $(NO_ASM))
-- DEFINES += -DNO_ASSEMBLY
--endif
--
--#----------------------------------------------------------------------
--# Rules Section
--#----------------------------------------------------------------------
--
--MODULES = grlib.o driver.o line.o palette.o scale.o text.o font8x8.o \
-- cbitmap.o mem.o
--
--all: libvgagl.a
--.PHONY: all clean dep
--
--libvgagl.so: libvgagl.so.$(VERSION)
--libvgagl.so.$(VERSION): $(MODULES)
-- $(CC) -s -shared -Wl,-soname,libvgagl.so.$(MAJOR_VER) -o libvgagl.so.$(VERSION) \
-- $(MODULES) $(SHLIBLIBS) -L$(srcdir)/sharedlib -lvga
-- ln -sf libvgagl.so.$(VERSION) libvgagl.so
-- ln -sf libvgagl.so.$(VERSION) libvgagl.so.$(MAJOR_VER)
--
--libvgagl.a: $(MODULES)
-- rm -f libvgagl.a
-- $(AR) rcs libvgagl.a $(MODULES)
--
--.c.o:
-- $(CC) $(CFLAGS) -c -o $*.o $<
--
--.S.s:
-- $(CC) $(CFLAGS) -E $< >$@
--
--.s.o:
-- $(CC) $(CFLAGS) -c -o $*.o $<
--
--.c.s:
-- $(CC) $(CFLAGS) -S -o $*.s $<
--
--.o:
-- $(CC) $(CFLAGS) $(LDFLAGS) -o $* $*.o $(LIBS)
-- chmod 4755 $*
--
--$(MODULES): .depend.gl
--
--dep:
-- rm -f .depend.gl
-- make depend
--
--.depend.gl:
-- echo '# GL Module dependencies' >>.depend.gl
-- $(CC) $(INCLUDES) -MM $(patsubst %.o,$(srcdir)/gl/%.c,$(MODULES)) >>.depend.gl
--
--clean:
-- rm -f .depend.gl *.bak *.o *~ libvgagl.a libvgagl.so*
--
--#
--# include a dependency file if one exists
--#
--ifeq (.depend.gl,$(wildcard .depend.gl))
--include .depend.gl
--endif
-Index: b/svgalib/src/Makefile
-===================================================================
---- a/svgalib/src/Makefile
-+++ /dev/null
-@@ -1,445 +0,0 @@
--#----------------------------------------------------------------------
--# Makefile for the main svgalib source.
--#----------------------------------------------------------------------
--
--# *** NO SERVICIBLE PARTS HERE!
--# All options are in Makefile.cfg.
--
--include ../Makefile.cfg
--
--srcdir = ..
--VPATH = $(srcdir)/src
--
--#----------------------------------------------------------------------
--# Compiler Section (overrides Makefile.cfg)
--#----------------------------------------------------------------------
--
--INCLUDES += -I$(srcdir)/src -I$(srcdir)/src/config
--
--#----------------------------------------------------------------------
--# Rules Section
--#----------------------------------------------------------------------
--
--DRIVERS = vgadrv.o modetab.o
--MODULES = vga.o \
-- vgadraw.o vgaclear.o vgaline.o vgapix.o \
-- vgapal.o vgacol.o vgamodesel.o vgamisc.o \
-- vgadump.o vgaconvplanar.o vgaaccel.o \
-- timing.o vgaregs.o interface.o accel.o \
-- vgabgpage.o vgabgvt.o vgapci.o
--
--# defines for all files.
--ifeq (y, $(NO_ASM))
-- DEFINES += -DNO_ASSEMBLY
--endif
--ifdef SVGALIB_CONFIG_FILE
-- DEFINES += -DSVGALIB_CONFIG_FILE=\"$(SVGALIB_CONFIG_FILE)\"
--endif
--ifdef ALLOW_MOUSE_OVERRIDE
-- DEFINES += -DALLOW_MOUSE_OVERRIDE
--endif
--ifdef DEBUG_ACCEL
-- DEFINES += -DDEBUG_ACCEL
--endif
--ifdef DEBUG_KEYBOARD
-- DEFINES += -DDEBUG_KEYBOARD
--endif
--ifdef BACKGROUND
-- DEFINES += -DBACKGROUND=1
--endif
--ifeq (a.out, $(TARGET_FORMAT))
-- DEFINES += -DSVGA_AOUT
--endif
--
--# defines for vga.c only.
--ifdef ROOT_VC_SHORTCUT
-- VGA_DEFINES += -DROOT_VC_SHORTCUT
--endif
--
--ifdef DEBUG_CONF
-- DEFINES += -DDEBUG_CONF
--endif
--
--ifdef INCLUDE_ET4000_DRIVER
-- VGA_DEFINES += -DINCLUDE_ET4000_DRIVER
-- DRIVERS += et4000.o vgahico.o
-- ifdef INCLUDE_ET4000_DRIVER_TEST
-- VGA_DEFINES += -DINCLUDE_ET4000_DRIVER_TEST
-- endif
-- ifdef ET4000_REGS
-- DEFINES += -DET4000_REGS=\"$(ET4000_REGS)\"
-- endif
-- ifdef USE_CLOCKS
-- DEFINES += -DUSE_CLOCKS
-- endif
--endif
--ifdef INCLUDE_CIRRUS_DRIVER
-- VGA_DEFINES += -DINCLUDE_CIRRUS_DRIVER
-- DRIVERS += cirrus.o
-- ifdef INCLUDE_CIRRUS_DRIVER_TEST
-- VGA_DEFINES += -DINCLUDE_CIRRUS_DRIVER_TEST
-- endif
--endif
--ifdef INCLUDE_TVGA_DRIVER
-- VGA_DEFINES += -DINCLUDE_TVGA_DRIVER
-- DRIVERS += tvga8900.o
-- ifdef INCLUDE_TVGA_DRIVER_TEST
-- VGA_DEFINES += -DINCLUDE_TVGA_DRIVER_TEST
-- endif
--endif
--ifdef INCLUDE_OAK_DRIVER
-- VGA_DEFINES += -DINCLUDE_OAK_DRIVER
-- DRIVERS += oak.o
-- ifdef INCLUDE_OAK_DRIVER_TEST
-- VGA_DEFINES += -DINCLUDE_OAK_DRIVER_TEST
-- endif
--endif
--ifdef INCLUDE_EGA_DRIVER
-- VGA_DEFINES += -DINCLUDE_EGA_DRIVER
-- DRIVERS += egadrv.o
-- ifdef INCLUDE_EGA_DRIVER_TEST
-- VGA_DEFINES += -DINCLUDE_EGA_DRIVER_TEST
-- endif
-- ifdef EGA_REGS
-- DEFINES += -DEGA_REGS=\"$(EGA_REGS)\"
-- endif
--endif
--ifdef INCLUDE_MACH32_DRIVER
-- VGA_DEFINES += -DINCLUDE_MACH32_DRIVER
-- DRIVERS += mach32.o
-- ifdef INCLUDE_MACH32_DRIVER_TEST
-- VGA_DEFINES += -DINCLUDE_MACH32_DRIVER_TEST
-- endif
--endif
--ifdef INCLUDE_S3_DRIVER
-- VGA_DEFINES += -DINCLUDE_S3_DRIVER
-- DRIVERS += s3.o
-- ifdef INCLUDE_S3_DRIVER_TEST
-- VGA_DEFINES += -DINCLUDE_S3_DRIVER_TEST
-- endif
--endif
--ifdef INCLUDE_ET3000_DRIVER
-- VGA_DEFINES += -DINCLUDE_ET3000_DRIVER
-- DRIVERS += et3000.o
-- ifdef INCLUDE_ET3000_DRIVER_TEST
-- VGA_DEFINES += -DINCLUDE_ET3000_DRIVER_TEST
-- endif
--endif
--ifdef INCLUDE_GVGA6400_DRIVER
-- VGA_DEFINES += -DINCLUDE_GVGA6400_DRIVER
-- DRIVERS += gvga6400.o
-- ifdef INCLUDE_GVGA6400_DRIVER_TEST
-- VGA_DEFINES += -DINCLUDE_GVGA6400_DRIVER_TEST
-- endif
--endif
--ifdef INCLUDE_ARK_DRIVER
-- VGA_DEFINES += -DINCLUDE_ARK_DRIVER
-- DRIVERS += ark.o
-- ifdef INCLUDE_ARK_DRIVER_TEST
-- VGA_DEFINES += -DINCLUDE_ARK_DRIVER_TEST
-- endif
--endif
--ifdef INCLUDE_ATI_DRIVER
-- VGA_DEFINES += -DINCLUDE_ATI_DRIVER
-- DRIVERS += ati.o
-- ifdef INCLUDE_ATI_DRIVER_TEST
-- VGA_DEFINES += -DINCLUDE_ATI_DRIVER_TEST
-- endif
--endif
--ifdef INCLUDE_ALI_DRIVER
-- VGA_DEFINES += -DINCLUDE_ALI_DRIVER
-- DRIVERS += ali.o
-- ifdef INCLUDE_ALI_DRIVER_TEST
-- VGA_DEFINES += -DINCLUDE_ALI_DRIVER_TEST
-- endif
--endif
--ifdef INCLUDE_MACH64_DRIVER
-- VGA_DEFINES +=-DINCLUDE_MACH64_DRIVER
-- DRIVERS += mach64.o
-- ifdef INCLUDE_MACH64_DRIVER_TEST
-- VGA_DEFINES += -DINCLUDE_MACH64_DRIVER_TEST
-- endif
--endif
--ifdef INCLUDE_CHIPS_DRIVER
-- VGA_DEFINES +=-DINCLUDE_CHIPS_DRIVER
-- DRIVERS += chips.o
-- ifdef INCLUDE_CHIPS_DRIVER_TEST
-- VGA_DEFINES += -DINCLUDE_CHIPS_DRIVER_TEST
-- endif
--endif
--ifdef INCLUDE_APM_DRIVER
-- VGA_DEFINES +=-DINCLUDE_APM_DRIVER
-- DRIVERS += apm.o
-- ifdef INCLUDE_APM_DRIVER_TEST
-- VGA_DEFINES += -DINCLUDE_APM_DRIVER_TEST
-- endif
--endif
--ifdef INCLUDE_VESA_DRIVER
-- VGA_DEFINES +=-DINCLUDE_VESA_DRIVER
-- DRIVERS += vesa.o
-- ifdef INCLUDE_VESA_DRIVER_TEST
-- VGA_DEFINES += -DINCLUDE_VESA_DRIVER_TEST
-- endif
--endif
--ifdef INCLUDE_NV3_DRIVER
-- VGA_DEFINES +=-DINCLUDE_NV3_DRIVER
-- DRIVERS += nv3.o
-- ifdef INCLUDE_NV3_DRIVER_TEST
-- VGA_DEFINES += -DINCLUDE_NV3_DRIVER_TEST
-- endif
--endif
--ifdef INCLUDE_G400_DRIVER
-- VGA_DEFINES +=-DINCLUDE_G400_DRIVER
-- DRIVERS += g400.o
-- ifdef INCLUDE_G400_DRIVER_TEST
-- VGA_DEFINES += -DINCLUDE_G400_DRIVER_TEST
-- endif
--endif
--ifdef INCLUDE_R128_DRIVER
-- VGA_DEFINES +=-DINCLUDE_R128_DRIVER
-- DRIVERS += r128.o
-- ifdef INCLUDE_R128_DRIVER_TEST
-- VGA_DEFINES += -DINCLUDE_R128_DRIVER_TEST
-- endif
--endif
--ifdef INCLUDE_MX_DRIVER
-- VGA_DEFINES +=-DINCLUDE_MX_DRIVER
-- DRIVERS += mx.o
-- ifdef INCLUDE_MX_DRIVER_TEST
-- VGA_DEFINES += -DINCLUDE_MX_DRIVER_TEST
-- endif
--endif
--ifdef INCLUDE_SAVAGE_DRIVER
-- VGA_DEFINES +=-DINCLUDE_SAVAGE_DRIVER
-- DRIVERS += savage.o
-- ifdef INCLUDE_SAVAGE_DRIVER_TEST
-- VGA_DEFINES += -DINCLUDE_SAVAGE_DRIVER_TEST
-- endif
--endif
--ifdef INCLUDE_PARADISE_DRIVER
-- VGA_DEFINES +=-DINCLUDE_PARADISE_DRIVER
-- DRIVERS += paradise.o
-- ifdef INCLUDE_PARADISE_DRIVER_TEST
-- VGA_DEFINES += -DINCLUDE_PARADISE_DRIVER_TEST
-- endif
--endif
--ifdef INCLUDE_RAGE_DRIVER
-- VGA_DEFINES +=-DINCLUDE_RAGE_DRIVER
-- DRIVERS += rage.o
-- ifdef INCLUDE_RAGE_DRIVER_TEST
-- VGA_DEFINES += -DINCLUDE_RAGE_DRIVER_TEST
-- endif
--endif
--ifdef INCLUDE_BANSHEE_DRIVER
-- VGA_DEFINES +=-DINCLUDE_BANSHEE_DRIVER
-- DRIVERS += banshee.o
-- ifdef INCLUDE_BANSHEE_DRIVER_TEST
-- VGA_DEFINES += -DINCLUDE_BANSHEE_DRIVER_TEST
-- endif
--endif
--ifdef INCLUDE_SIS_DRIVER
-- VGA_DEFINES +=-DINCLUDE_SIS_DRIVER
-- DRIVERS += sis.o
-- ifdef INCLUDE_SIS_DRIVER_TEST
-- VGA_DEFINES += -DINCLUDE_SIS_DRIVER_TEST
-- endif
--endif
--ifdef INCLUDE_I740_DRIVER
-- VGA_DEFINES +=-DINCLUDE_I740_DRIVER
-- DRIVERS += i740.o
-- ifdef INCLUDE_I740_DRIVER_TEST
-- VGA_DEFINES += -DINCLUDE_I740_DRIVER_TEST
-- endif
--endif
--ifdef INCLUDE_LAGUNA_DRIVER
-- VGA_DEFINES +=-DINCLUDE_LAGUNA_DRIVER
-- DRIVERS += laguna.o
-- ifdef INCLUDE_LAGUNA_DRIVER_TEST
-- VGA_DEFINES += -DINCLUDE_LAGUNA_DRIVER_TEST
-- endif
--endif
--ifdef INCLUDE_ET6000_DRIVER
-- VGA_DEFINES += -DINCLUDE_ET6000_DRIVER
-- DRIVERS += et6000.o
-- ifdef INCLUDE_ET6000_DRIVER_TEST
-- VGA_DEFINES += -DINCLUDE_ET6000_DRIVER_TEST
-- endif
--endif
--ifdef INCLUDE_NEO_DRIVER
-- VGA_DEFINES += -DINCLUDE_NEO_DRIVER
-- DRIVERS += neo.o
-- ifdef INCLUDE_NEO_DRIVER_TEST
-- VGA_DEFINES += -DINCLUDE_NEO_DRIVER_TEST
-- endif
--endif
--ifdef INCLUDE_FBDEV_DRIVER
-- VGA_DEFINES += -DINCLUDE_FBDEV_DRIVER
-- DRIVERS += fbdev.o
-- ifdef INCLUDE_FBDEV_DRIVER_TEST
-- VGA_DEFINES += -DINCLUDE_FBDEV_DRIVER_TEST
-- endif
--endif
--
--# DYNAMIC is used by both ET drivers.
--ifdef DYNAMIC
-- ifdef INCLUDE_ET6000_DRIVER
-- DEFINES += -DDYNAMIC
-- else
-- ifdef INCLUDE_ET4000_DRIVER
-- DEFINES += -DDYNAMIC
-- endif
-- endif
--endif
--
--# defines for ramdac.c, ramdac.h (and files including it) only.
--ifdef INCLUDE_NORMAL_DAC
-- RAMDAC_DEFINES += -DINCLUDE_NORMAL_DAC
-- ifdef INCLUDE_NORMAL_DAC_TEST
-- RAMDAC_DEFINES += -DINCLUDE_NORMAL_DAC_TEST
-- endif
--endif
--ifdef INCLUDE_S3_SDAC_DAC
-- RAMDAC_DEFINES += -DINCLUDE_S3_SDAC_DAC
-- ifdef INCLUDE_S3_SDAC_DAC_TEST
-- RAMDAC_DEFINES += -DINCLUDE_S3_SDAC_DAC_TEST
-- endif
--endif
--ifdef INCLUDE_S3_GENDAC_DAC
-- RAMDAC_DEFINES += -DINCLUDE_S3_GENDAC_DAC
-- ifdef INCLUDE_S3_GENDAC_DAC_TEST
-- RAMDAC_DEFINES += -DINCLUDE_S3_GENDAC_DAC_TEST
-- endif
--endif
--ifdef INCLUDE_S3_TRIO64_DAC
-- RAMDAC_DEFINES += -DINCLUDE_S3_TRIO64_DAC
-- ifdef INCLUDE_S3_TRIO64_DAC_TEST
-- RAMDAC_DEFINES += -DINCLUDE_S3_TRIO64_DAC_TEST
-- endif
--endif
--ifdef INCLUDE_SIERRA_DAC
-- RAMDAC_DEFINES += -DINCLUDE_SIERRA_DAC
-- ifdef INCLUDE_SIERRA_DAC_TEST
-- RAMDAC_DEFINES += -DINCLUDE_SIERRA_DAC_TEST
-- endif
--endif
--ifdef INCLUDE_SC15025_DAC
-- RAMDAC_DEFINES += -DINCLUDE_SC15025_DAC
-- ifdef INCLUDE_SC15025_DAC_TEST
-- RAMDAC_DEFINES += -DINCLUDE_SC15025_DAC_TEST
-- endif
--endif
--ifdef INCLUDE_ATT20C490_DAC
-- RAMDAC_DEFINES += -DINCLUDE_ATT20C490_DAC
-- ifdef INCLUDE_ATT20C490_DAC_TEST
-- RAMDAC_DEFINES += -DINCLUDE_ATT20C490_DAC_TEST
-- endif
--endif
--ifdef INCLUDE_ATT20C498_DAC
-- RAMDAC_DEFINES += -DINCLUDE_ATT20C498_DAC
-- ifdef INCLUDE_ATT20C498_DAC_TEST
-- RAMDAC_DEFINES += -DINCLUDE_ATT20C498_DAC_TEST
-- endif
--endif
--ifdef INCLUDE_ICW_DAC
-- RAMDAC_DEFINES += -DINCLUDE_ICW_DAC
-- ifdef INCLUDE_ICW_DAC_TEST
-- RAMDAC_DEFINES += -DINCLUDE_ICW_DAC_TEST
-- endif
--endif
--ifdef INCLUDE_IBMRGB52x_DAC
-- RAMDAC_DEFINES += -DINCLUDE_IBMRGB52x_DAC
-- ifdef INCLUDE_IBMRGB52x_DAC_TEST
-- RAMDAC_DEFINES += -DINCLUDE_IBMRGB52x_DAC_TEST
-- endif
--endif
--ifdef INCLUDE_SC1148X_DAC
-- RAMDAC_DEFINES += -DINCLUDE_SC1148X_DAC
-- ifdef INCLUDE_SC1148X_DAC_TEST
-- RAMDAC_DEFINES += -DINCLUDE_SC1148X_DAC_TEST
-- endif
--endif
--
--ALLOBJS = $(MODULES) $(MOUSE) $(JOYSTICK) $(KEYBOARD) $(RAMDAC) $(CLOCKCHIP) $(DRIVERS) $(X86EMU)
--
--.c.o:
-- $(CC) $(CFLAGS) -g -c -o $*.o $<
--
--.c.s:
-- $(CC) $(CFLAGS) -S -o $*.s $<
--
--.PHONY: all dep depadd clean install FORCE
--
--
--
--ifeq (a.out, $(TARGET_FORMAT))
--
--all: libvga.a
--
--else
--
--all: libvga.so.$(VERSION)
--
--# These rules are for ELF only.
--libvga.so.$(VERSION): $(ALLOBJS)
-- $(CC) -s -shared -Wl,-soname,libvga.so.$(MAJOR_VER) \
-- -o libvga.so.$(VERSION) $(ALLOBJS) $(SHLIBLIBS) -lm -lx86
-- ln -sf libvga.so.$(VERSION) libvga.so
-- ln -sf libvga.so.$(VERSION) libvga.so.$(MAJOR_VER)
--
--$(sharedlibdir)/libvga.so.$(VERSION): libvga.so.$(VERSION)
-- $(INSTALL_PROGRAM) $< $(sharedlibdir)/$<
--
--install: $(sharedlibdir)/libvga.so.$(VERSION)
-- cp -df sharedlib/libvga.so $(sharedlibdir)/
-- cp -df sharedlib/libvga.so.$(MAJOR_VER) $(sharedlibdir)/
--
--endif
--
--libvga.a: $(ALLOBJS)
-- rm -f libvga.a
-- $(AR) rcs libvga.a $(ALLOBJS)
--
--libvgagl.a: FORCE
-- make -f $(srcdir)/gl/Makefile $@ srcdir="$(srcdir)" DLLFLAGS="$(DLLFLAGS)"
--
--vga.o: vga.c
-- $(CC) $(CFLAGS) $(VGA_DEFINES) -c -o $@ $<
--
--# XXX: Upstream used this so it may break, disabled to close an RC
--# lrmi must NOT be compiled as -fPIC
--lrmi.o: lrmi.c
-- $(CC) $(CFLAGS) -c -o $@ $<
--# $(CC) $(CFLAGS:-fPIC=) -c -o $@ $<
--
--$(RAMDAC): %.o: %.c
-- $(CC) $(CFLAGS) $(RAMDAC_DEFINES) -c -o $@ $<
--
--s3.o ark.o: %.o: %.c
-- $(CC) $(CFLAGS) $(RAMDAC_DEFINES) -c -o $@ $<
--
--nucleus.o: %.o: %.c
-- $(CC) $(CFLAGS) $(RAMDAC_DEFINES) -c -o $@ $< scitech.o
--
--$(MODULES): .depend.src
--
--dep:
-- rm -f .depend.src
-- make .depend.src
--
--.depend.src:
-- echo '# Module dependencies' >>.depend.src
-- $(CC) $(INCLUDES) -MM $(patsubst %.o,$(srcdir)/src/%.c,$(MODULES)) >>.depend.src
--
--clean:
-- rm -f .depend.src *~ *.o mouse/*.o keyboard/*.o mouse/*~ keyboard/*~ \
-- ramdac/*.o clockchip/*.o ramdac/*~ clockchip/*~ \
-- libvga.a libvga.so.$(VERSION) *.bak */*.bak
--
--FORCE: # dummy target.
--
--#
--# include a dependency file if one exists
--#
--ifeq (.depend.src,$(wildcard .depend.src))
--include .depend.src
--endif
diff --git a/patches/usplash_0.5.49/series b/patches/usplash_0.5.49/series
deleted file mode 100644
index e4a817122..000000000
--- a/patches/usplash_0.5.49/series
+++ /dev/null
@@ -1,4 +0,0 @@
-remove-old-buildsystem.diff
-autotools.diff
-cross-compile.diff
-
diff --git a/rules/host-usplash.in b/rules/host-usplash.in
deleted file mode 100644
index 265e29303..000000000
--- a/rules/host-usplash.in
+++ /dev/null
@@ -1,8 +0,0 @@
-## SECTION=staging
-## old section:
-### SECTION=hosttools_noprompt
-
-config HOST_USPLASH
- tristate
- select HOST_LIBGD
- default ALLYES
diff --git a/rules/host-usplash.make b/rules/host-usplash.make
deleted file mode 100644
index fe29a9bd7..000000000
--- a/rules/host-usplash.make
+++ /dev/null
@@ -1,46 +0,0 @@
-# -*-makefile-*-
-#
-# Copyright (C) 2008, 2011 by Michael Olbrich <m.olbrich@pengutronix.de>
-#
-# See CREDITS for details about who has contributed to this project.
-#
-# For further information about the PTXdist project and license conditions
-# see the README file.
-#
-
-#
-# We provide this package
-#
-HOST_PACKAGES-$(PTXCONF_HOST_USPLASH) += host-usplash
-
-#
-# Paths and names
-#
-HOST_USPLASH_DIR = $(HOST_BUILDDIR)/$(USPLASH)
-
-# ----------------------------------------------------------------------------
-# Prepare
-# ----------------------------------------------------------------------------
-
-HOST_USPLASH_PATH := PATH=$(HOST_PATH)
-HOST_USPLASH_ENV := $(HOST_ENV)
-
-#
-# autoconf
-#
-HOST_USPLASH_CONF_TOOL := autoconf
-HOST_USPLASH_CONF_OPT := $(HOST_AUTOCONF) \
- --enable-static \
- --disable-svga-backend \
- --enable-convert-tools
-
-$(STATEDIR)/host-usplash.prepare:
- @$(call targetinfo)
- @chmod +x $(HOST_USPLASH_DIR)/configure
- @$(call world/prepare, HOST_USPLASH)
- @$(call touch)
-
-HOST_USPLASH_MAKE_OPT := -C bogl
-HOST_USPLASH_INSTALL_OPT := -C bogl install
-
-# vim: syntax=make
diff --git a/rules/usplash.in b/rules/usplash.in
deleted file mode 100644
index 17b301546..000000000
--- a/rules/usplash.in
+++ /dev/null
@@ -1,15 +0,0 @@
-## SECTION=staging
-## old section:
-### SECTION=multimedia_framebuffer
-
-config USPLASH
- tristate
- select LIBX86
- select HOST_USPLASH
- prompt "usplash"
- help
- Usplash is a userspace application that uses the Linux
- framebuffer interface to draw a splash screen at boot.
-
- STAGING: remove in ptxdist-2018.07.0
- Upstream long dead, obsolete and fails to build.
diff --git a/rules/usplash.make b/rules/usplash.make
deleted file mode 100644
index 037a06c63..000000000
--- a/rules/usplash.make
+++ /dev/null
@@ -1,76 +0,0 @@
-# -*-makefile-*-
-#
-# Copyright (C) 2008 by Robert Schwebel
-# 2009 by Marc Kleine-Budde <mkl@pengutronix.de>
-# 2011 by Michael Olbrich <m.olbrich@pengutronix.de>
-#
-# See CREDITS for details about who has contributed to this project.
-#
-# For further information about the PTXdist project and license conditions
-# see the README file.
-#
-
-#
-# We provide this package
-#
-ifndef PTXCONF_ARCH_X86_64
-PACKAGES-$(PTXCONF_ARCH_X86)-$(PTXCONF_USPLASH) += usplash
-endif
-
-#
-# Paths and names
-#
-USPLASH_VERSION := 0.5.49
-USPLASH_MD5 := 6b1fd6c109456f47cbad1b1ccaa2bf53
-USPLASH := usplash_$(USPLASH_VERSION)
-USPLASH_SUFFIX := tar.gz
-USPLASH_URL := http://usplash.sourcearchive.com/downloads/$(USPLASH_VERSION)/$(USPLASH).$(USPLASH_SUFFIX)
-USPLASH_SOURCE := $(SRCDIR)/$(USPLASH).$(USPLASH_SUFFIX)
-USPLASH_DIR := $(BUILDDIR)/$(USPLASH)
-
-# ----------------------------------------------------------------------------
-# Prepare
-# ----------------------------------------------------------------------------
-
-#
-# autoconf
-#
-USPLASH_CONF_TOOL := autoconf
-USPLASH_CONF_OPT := \
- $(CROSS_AUTOCONF_USR) \
- --enable-static \
- --enable-svga-backend \
- --disable-convert-tools
-
-$(STATEDIR)/usplash.prepare:
- @$(call targetinfo)
- @chmod +x $(USPLASH_DIR)/configure
- @$(call world/prepare, USPLASH)
- @$(call touch)
-
-USPLASH_MAKE_PAR := NO
-
-# ----------------------------------------------------------------------------
-# Target-Install
-# ----------------------------------------------------------------------------
-
-$(STATEDIR)/usplash.targetinstall:
- @$(call targetinfo)
-
- @$(call install_init, usplash)
- @$(call install_fixup, usplash,PRIORITY,optional)
- @$(call install_fixup, usplash,SECTION,base)
- @$(call install_fixup, usplash,AUTHOR,"Robert Schwebel <r.schwebel@pengutronix.de>")
- @$(call install_fixup, usplash,DESCRIPTION,missing)
-
- @$(call install_copy, usplash, 0, 0, 0755, -, /usr/sbin/usplash)
- @$(call install_copy, usplash, 0, 0, 0755, -, /usr/sbin/usplash_write)
- @$(call install_copy, usplash, 0, 0, 0755, -, /usr/sbin/usplash_down)
- @$(call install_copy, usplash, 0, 0, 0755, -, /usr/sbin/update-usplash-theme)
- @$(call install_lib, usplash, 0, 0, 0644, libusplash)
-
- @$(call install_finish, usplash)
-
- @$(call touch)
-
-# vim: syntax=make