From 24a16d57e27be5db5c920e91710d10028d24ff8e Mon Sep 17 00:00:00 2001 From: Gwenhael Le Moine Date: Wed, 26 Apr 2023 16:48:46 +0200 Subject: [PATCH] delete autotools files, use only simple Makefile --- MANIFEST | 62 --------------- Makefile.standalone => Makefile | 14 ++-- Makefile.am | 12 --- NEWS | 1 - autogen.sh | 9 --- configure.ac | 133 -------------------------------- romdump/Makefile.am | 4 - src/Makefile.am | 27 ------- utils/ad2c | 38 --------- utils/makeversion | 14 ---- version.m4 | 6 -- 11 files changed, 7 insertions(+), 313 deletions(-) delete mode 100644 MANIFEST rename Makefile.standalone => Makefile (92%) delete mode 100644 Makefile.am delete mode 100644 NEWS delete mode 100755 autogen.sh delete mode 100644 configure.ac delete mode 100644 romdump/Makefile.am delete mode 100644 src/Makefile.am delete mode 100755 utils/ad2c delete mode 100755 utils/makeversion delete mode 100644 version.m4 diff --git a/MANIFEST b/MANIFEST deleted file mode 100644 index cfe5394..0000000 --- a/MANIFEST +++ /dev/null @@ -1,62 +0,0 @@ -README -Imakefile -config.h -MANIFEST -ChangeLog -utils/Imakefile -utils/ad2c -utils/makeversion -src/Imakefile -src/X48.ad -src/actions.c -src/debugger.c -src/device.c -src/disasm.c -src/emulate.c -src/init.c -src/lcd.c -src/main.c -src/memory.c -src/options.c -src/register.c -src/resources.c -src/rpl.c -src/serial.c -src/timer.c -src/x48_x11.c -src/dump2rom.c -src/checkrom.c -src/annunc.h -src/append.h -src/buttons.h -src/constants.h -src/debugger.h -src/defaults.h -src/device.h -src/disasm.h -src/global.h -src/hp.h -src/hp48.h -src/hp48_emu.h -src/hp48char.h -src/icon.h -src/options.h -src/resources.h -src/rpl.h -src/small.h -src/timer.h -src/version.h -src/x48.man -src/x48_x11.h -romdump/Imakefile -romdump/ROMDump -romdump/README -romdump/ReadRom.s -romdump/Dump -doc/Imakefile -doc/ChangeLog -doc/COPYING -doc/INSTALLING -doc/TODO -doc/CARDS.doc -doc/ROMDump.doc diff --git a/Makefile.standalone b/Makefile similarity index 92% rename from Makefile.standalone rename to Makefile index f388fa1..ba62824 100644 --- a/Makefile.standalone +++ b/Makefile @@ -9,27 +9,27 @@ all: mkcard checkrom dump2rom x48 # Binaries mkcard: src/mkcard.c - $(CC) $(CFLAGS) $(LIBS) $^ -o $@ + $(CC) $(CFLAGS) $(LIBS) $^ -o $@ dump2rom: src/dump2rom.c - $(CC) $(CFLAGS) $(LIBS) $^ -o $@ + $(CC) $(CFLAGS) $(LIBS) $^ -o $@ checkrom: src/checkrom.c src/romio.o - $(CC) $(CFLAGS) $(LIBS) $^ -o $@ + $(CC) $(CFLAGS) $(LIBS) $^ -o $@ x48: src/main.o src/actions.o src/debugger.o src/device.o src/disasm.o src/emulate.o src/errors.o src/init.o src/lcd.o src/memory.o src/register.o src/resources.o src/romio.o src/rpl.o src/serial.o src/timer.o src/x48_x11.o src/options.o src/resources.o - $(CC) $(CFLAGS) $(LIBS) $^ -o $@ + $(CC) $(CFLAGS) $(LIBS) $^ -o $@ # Cleaning clean: - rm -f src/*.o + rm -f src/*.o clean-all: clean - rm -f x48 mkcard checkrom dump2rom + rm -f x48 mkcard checkrom dump2rom # Formatting pretty-code: - clang-format -i src/*.c src/*.h + clang-format -i src/*.c src/*.h # Objects # %.o: %.c %.d diff --git a/Makefile.am b/Makefile.am deleted file mode 100644 index fb4e3f7..0000000 --- a/Makefile.am +++ /dev/null @@ -1,12 +0,0 @@ -AUTOMAKE_OPTIONS = dejagnu - -SUBDIRS = src romdump - -EXTRA_DIST= - -X48 : src/X48.ad - cp $< $@ - -appdefault_DATA = X48 - -DISTCHECK_CONFIGURE_FLAGS = --with-appdefaultdir='$${datadir}/X11/app-defaults' diff --git a/NEWS b/NEWS deleted file mode 100644 index 8b13789..0000000 --- a/NEWS +++ /dev/null @@ -1 +0,0 @@ - diff --git a/autogen.sh b/autogen.sh deleted file mode 100755 index 2977411..0000000 --- a/autogen.sh +++ /dev/null @@ -1,9 +0,0 @@ -#! /bin/sh - -set -x -aclocal -#libtoolize --force --copy -autoheader -automake --add-missing --copy -Wno-portability -autoconf - diff --git a/configure.ac b/configure.ac deleted file mode 100644 index 37b13de..0000000 --- a/configure.ac +++ /dev/null @@ -1,133 +0,0 @@ -m4_include([version.m4]) -AC_INIT([x48],[VERSION_NUMBER],[x48-bugs@gam3.net]) - -AC_COPYRIGHT([Copyright (c) 2006-2010 G. Allen Morris III]) -AC_CANONICAL_TARGET - -AC_PREREQ([2.71]) - -AC_CONFIG_SRCDIR([config.h.in]) -AC_CONFIG_HEADERS([config.h]) - -# Checks for programs. -AC_PROG_CC -AC_PROG_INSTALL -AC_PROG_LN_S -AC_PROG_CPP - -AC_PATH_XTRA -if test x"$no_x" = xyes ; then - AC_MSG_ERROR([X development libraries not found]) -fi -X_LIBS="$X_LIBS -lX11" -AC_SUBST(X_LIBS) - -PKG_PROG_PKG_CONFIG([0.20]) - -# ********* readline library -AC_ARG_ENABLE(readline, - [ --disable-readline disable readline support], - [ if test x"$enableval" = xyes; then - with_readline="yes, check" - else - with_readline="no" - problem_readline=": Explicitly disabled" - fi ], - [ with_readline="not specified, check" ] -) - -AH_TEMPLATE([HAVE_READLINE],[Define if Readline is used.]) -if test x"$with_readline" != xno; then - AC_CHECK_LIB(readline, readline, - with_readline=yes; - LIBS="$LIBS -lreadline"; - AC_DEFINE(HAVE_READLINE), - with_readline=no; - problem_readline=": Can't detect readline library.", - []) - AC_CHECK_LIB(history, add_history) - AC_CHECK_HEADERS([readline/readline.h]) - AC_CHECK_HEADERS([readline/history.h]) -fi - -# ********* MIT Shared Memory Extension -AC_ARG_ENABLE(shm, - [ --disable-shm disable MIT Shared Memory Extension], - [ if test x"$enableval" = xyes; then - with_shm="yes, check" - else - with_shm="no" - problem_shm=": Explicitly disabled" - fi ], - [ with_shm="not specified, check" ] -) - -AH_TEMPLATE([HAVE_XSHM],[Define if MIT Shared Memory extension is used.]) -if test x"$with_shm" != xno; then -AC_CHECK_HEADER(X11/extensions/XShm.h, [ - AC_CHECK_LIB(Xext, XShmQueryExtension, - with_shm=yes; AC_DEFINE(HAVE_XSHM), - with_shm=no; - problem_shm=": Can't detect MIT Shared Memory ext.", - [$X_LIBS $X_PRE_LIBS -lX11 $X_EXTRA_LIBS]) - ],problem_shm=": Can't detect MIT Shared Memory headers.",[#include ]) -fi -if test x"$with_shm" = xyes ; then -X_LIBS="$X_LIBS -lXext" -fi - -# Checks for libraries. -AC_CHECK_LIB([GL], [XCloseDisplay]) - -# Checks for header files. -AC_CHECK_HEADERS([fcntl.h memory.h stdlib.h string.h sys/ioctl.h sys/time.h termios.h unistd.h stdint.h]) - -# Checks for typedefs, structures, and compiler characteristics. -AC_C_CONST -AC_C_INLINE -AC_TYPE_SIZE_T - -AC_STRUCT_TM - -AC_DEFINE([VERSION_MAJOR], _VERSION_MAJOR, [The major version number]) -AC_DEFINE([VERSION_MINOR], _VERSION_MINOR, [The minor version number]) -AC_DEFINE([PATCHLEVEL], _PATCHLEVEL, [The patch level]) - - -AC_DEFINE_UNQUOTED([COMPILE_TIME], "`date`", [Date program was compiled]) -AC_DEFINE([COMPILE_VERSION], [0], [description]) - -# Checks for library functions. -AC_PROG_GCC_TRADITIONAL -AC_FUNC_MALLOC -AC_FUNC_SELECT_ARGTYPES -AC_FUNC_STAT -AC_CHECK_FUNCS([bzero gethostname gettimeofday memset mkdir select strdup strrchr uname]) - -PKG_CHECK_MODULES(APPDEFS, xt) -AC_ARG_WITH([appdefaultdir], - [AS_HELP_STRING([--with-appdefaultdir=DIR],[Xt app-defaults directory (default: from pkg-config)])], - [appdefaultdir="$withval"], - [appdefaultdir=`$PKG_CONFIG --variable=appdefaultdir xt`]) -AC_SUBST(appdefaultdir) - -AM_INIT_AUTOMAKE - -AC_CONFIG_FILES([Makefile - romdump/Makefile - src/x48.man - src/Makefile]) -AC_OUTPUT - -echo " -X48 Configuration: - - Version: $VERSION$VERSIONINFO - - Executables: $bindir - Man pages: $mandir - - With ReadLine sup. in Debuger? $with_readline$problem_readline - With Shared memory for XImage? $with_shm$problem_shm - -# See INSTALL for the description of what this may mean." diff --git a/romdump/Makefile.am b/romdump/Makefile.am deleted file mode 100644 index 2b821bf..0000000 --- a/romdump/Makefile.am +++ /dev/null @@ -1,4 +0,0 @@ - -EXTRA_DIST = ROMDump.s ROMDump - - diff --git a/src/Makefile.am b/src/Makefile.am deleted file mode 100644 index bd24fc4..0000000 --- a/src/Makefile.am +++ /dev/null @@ -1,27 +0,0 @@ -## Process this file with automake to produce Makefile.in - -bin_PROGRAMS = x48 dump2rom mkcard checkrom - -x48_SOURCES = actions.c debugger.c device.c \ - disasm.c emulate.c errors.c init.c \ - lcd.c main.c memory.c options.c register.c \ - resources.c romio.c rpl.c serial.c timer.c \ - x48_x11.c \ - annunc.h append.h buttons.h constants.h debugger.h \ - device.h disasm.h errors.h global.h hp48char.h hp48_emu.h \ - hp48.h hp.h icon.h mmu.h options.h resources.h romio.h rpl.h \ - small.h timer.h version.h X48.ad.h x48_x11.h - -dump2rom_SOURCES = dump2rom.c - -mkcard_SOURCES = mkcard.c - -checkrom_SOURCES = checkrom.c romio.c - -man1_MANS = x48.man - -EXTRA_DIST = $(man1_MANS) X48.ad - -AM_CPPFLAGS = $(X_CFLAGS) - -x48_LDADD = $(X_LIBS) diff --git a/utils/ad2c b/utils/ad2c deleted file mode 100755 index 1435e55..0000000 --- a/utils/ad2c +++ /dev/null @@ -1,38 +0,0 @@ -#!/bin/sh -# -# ad2c : Convert app-defaults file to C strings decls. -# -# George Ferguson, ferguson@cs.rcohester.edu, 12 Nov 1990. -# 19 Mar 1991 : gf -# Made it self-contained. -# 6 Jan 1992 : mycroft@gnu.ai.mit.edu (Charles Hannum) -# Removed use of "-n" and ":read" label since Gnu and -# IBM sed print pattern space on "n" command. Still works -# with Sun sed, of course. -# 7 Jan 1992: matthew@sunpix.East.Sun.COM (Matthew Stier) -# Escape quotes after escaping backslashes. -# - -sed ' -/^!/d -/^$/d -s/\\/\\\\/g -s/\\$//g -s/"/\\"/g -s/^/"/ -: test -/\\$/b slash -s/$/",/ -p -d -: slash -n -/^!/d -/^$/d -s/"/\\"/g -s/\\\\/\\/g -s/\\n/\\\\n/g -s/\\t/\\\\t/g -s/\\f/\\\\f/g -s/\\b/\\\\b/g -b test' "$@" diff --git a/utils/makeversion b/utils/makeversion deleted file mode 100755 index 5c7696d..0000000 --- a/utils/makeversion +++ /dev/null @@ -1,14 +0,0 @@ -#! /bin/sh - -if [ ! -f .version ] -then - echo 0 > .version -fi -cycle=`cat .version` -cycle=`expr $cycle + 1` -if [ $cycle -gt 255 ] -then - cycle=0 -fi -echo $cycle > .version - diff --git a/version.m4 b/version.m4 deleted file mode 100644 index ea2102f..0000000 --- a/version.m4 +++ /dev/null @@ -1,6 +0,0 @@ - -m4_define(_VERSION_MAJOR, [0]) -m4_define(_VERSION_MINOR, [6]) -m4_define(_PATCHLEVEL, [4]) - -m4_define(VERSION_NUMBER, [_VERSION_MAJOR._VERSION_MINOR._PATCHLEVEL])