From cab1d4fbd2df69710c1312b0f38a748f0f10993a Mon Sep 17 00:00:00 2001 From: Mark Wooding Date: Fri, 8 Nov 2019 16:55:32 +0000 Subject: [PATCH 1/1] Example project using nonrecursive make. --- .gitignore | 14 ++ Makefile.in | 157 +++++++++++++ build-aux/install-sh | 508 ++++++++++++++++++++++++++++++++++++++++++ build-aux/subdirmk.in | 32 +++ configure.ac | 42 ++++ lib/Makefile.in | 1 + lib/Subdir.mk | 37 +++ lib/t/Makefile.in | 1 + lib/t/Subdir.mk | 41 ++++ lib/t/toytest.c | 18 ++ lib/toylib.c | 4 + lib/toylib.h | 12 + src/Makefile.in | 1 + src/Subdir.mk | 35 +++ src/toy.c | 5 + 15 files changed, 908 insertions(+) create mode 100644 .gitignore create mode 100644 Makefile.in create mode 100755 build-aux/install-sh create mode 100644 build-aux/subdirmk.in create mode 100644 configure.ac create mode 120000 lib/Makefile.in create mode 100644 lib/Subdir.mk create mode 120000 lib/t/Makefile.in create mode 100644 lib/t/Subdir.mk create mode 100644 lib/t/toytest.c create mode 100644 lib/toylib.c create mode 100644 lib/toylib.h create mode 120000 src/Makefile.in create mode 100644 src/Subdir.mk create mode 100644 src/toy.c diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..2bd52df --- /dev/null +++ b/.gitignore @@ -0,0 +1,14 @@ +## Build artifacts. +*.a +*.d +*.o +*.stamp +/lib/t/toytest +/src/toy + +## Autoconf cruft. +Makefile +/autom4te.cache/ +/config.log +/config.status +/configure diff --git a/Makefile.in b/Makefile.in new file mode 100644 index 0000000..d8d8def --- /dev/null +++ b/Makefile.in @@ -0,0 +1,157 @@ +### -*-makefile-gmake-*- +### +### Top-level build script for toy project. +### +### (c) 2019 Mark Wooding +### + +###----- Licensing notice --------------------------------------------------- +### +### This program is free software; you can redistribute it and/or modify +### it under the terms of the GNU Library General Public License as +### published by the Free Software Foundation; either version 2 of the +### License, or (at your option) any later version. +### +### This program is distributed in the hope that it will be useful, +### but WITHOUT ANY WARRANTY; without even the implied warranty of +### MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +### GNU Library General Public License for more details. +### +### You should have received a copy of the GNU Library General Public +### License along with this program; if not, write to the Free +### Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, +### MA 02111-1307, USA. + +## Default target. +all:: + +###-------------------------------------------------------------------------- +### Configuration things. + +## (This is a toy. More stuff is needed in a proper project.) + +## Source and build directories. +srcdir = @srcdir@ +abs_srcdir = @abs_srcdir@ +abs_builddir = @abs_builddir@ + +## Installation directories. +prefix = @prefix@ +exec_prefix = @exec_prefix@ +bindir = @bindir@ + +## Build options. +CC = @CC@ +CFLAGS = @CFLAGS@ +DEFS = @DEFS@ +INCLUDES = @INCLUDES@ +LD = @CC@ +LDFLAGS = @LDFLAGS@ +LIBS = @LIBS@ + +INCLUDES += -I$(srcdir)/lib/ + +###-------------------------------------------------------------------------- +### Machinery. + +dirvars = +dirtargets = +ALL_SUBDIRS := +D := +%dirstack := + +dirvars += TARGETS PROGRAMS LIBS CLEANFILES +dirtargets += all clean check install + +define %descend-subdir + %dirstack := $$D $$(%dirstack) + D := $$(if $$D,$$D/)$1 + ALL_SUBDIRS += $$D + include $$(srcdir)/$$D/Subdir.mk + D := $$(firstword $$(dirstack)) + %dirstack := $$(wordlist 2,$$(words $$(%dirstack)),$$(%dirstack)) +endef +descend-subdirs = $(foreach d,$1, \ + $(eval $(call %descend-subdir,$d))) + +V = 0 +v-tag = $(call %v-tag.$V,$1) +%v-tag.0 = @printf " %-8s %s\n" "$1" "$@"; +%v-tag.1 = + +V_AT = $(%V_AT.$V) +%V_AT.0 = @ +%V_AT.1 = + +VPATH = $(srcdir) + +COMPILE = $(call v-tag,CC)$(CC) -c -o$@ -MD \ + $(DEFS) $(INCLUDES) $(CFLAGS) +%.o: %.c + $(COMPILE) $< + +LINK = $(call v-tag,LD)$(LD) -o$@ \ + $(CFLAGS) $(LDFLAGS) $(LIBS) + +objects = $(addsuffix $(if $2,$2,.o), \ + $(basename $(filter %.c %.s %.S,$1))) + +ALL_DEPFILES := +notice-objects = $(eval ALL_DEPFILES += $$(patsubst %.o,%.d,$1)) + +###-------------------------------------------------------------------------- +### Descend into subdirectories. + +SUBDIRS = + +SUBDIRS += lib +SUBDIRS += src + +$(call descend-subdirs, $(SUBDIRS)) + +###-------------------------------------------------------------------------- +### Maintaining the build system. + +$(srcdir)/configure: $(srcdir)/configure.ac + $(call v-tag,AUTOCONF)cd $(srcdir) && autoconf + +config.status: $(srcdir)/configure + $(call v-tag,CONFIG)./config.status --recheck + +Makefile: config.status $(srcdir)/Makefile.in \ + $(foreach d,$(ALL_SUBDIRS), $d/Makefile) + $(call v-tag,SUBST)./config.status Makefile +$(foreach d,$(ALL_SUBDIRS), \ + $(eval $d/Makefile: config.status $$(srcdir)/$d/Makefile.in; \ + $$(call v-tag,SUBST)./config.status $$@)) + +###-------------------------------------------------------------------------- +### More machinery. + +all_dirtargets = $(foreach d,$(ALL_SUBDIRS), \ + $(foreach t,$(dirtargets), $d/$t)) + +$(all_dirtargets):: + +ifeq ($(origin SUBDIR),undefined) +$(foreach t,$(dirtargets), \ + $(eval $t:: $(foreach d,$(ALL_SUBDIRS),$d/$t))) +else +$(foreach t,$(dirtargets), \ + $(eval $t:: $(SUBDIR)/$t)) +endif +$(foreach d,$(SUBDIRS), \ + $(foreach t,$(dirtargets), \ + $(eval $d/$t::))) +.PHONY: $(foreach t,$(dirtargets),$t $(foreach d,$(ALL_SUBDIRS),$d/$t)) + +$(foreach d,$(ALL_SUBDIRS), $d/clean):: %/clean: + rm -f $*/*.o $*/*.d $($*_CLEANFILES) + +realclean:: clean + rm -f config.status config.log + rm -f Makefile $(foreach d,$(ALL_SUBDIRS), $d/Makefile) + +-include $(ALL_DEPFILES) + +###----- That's all, folks -------------------------------------------------- diff --git a/build-aux/install-sh b/build-aux/install-sh new file mode 100755 index 0000000..59990a1 --- /dev/null +++ b/build-aux/install-sh @@ -0,0 +1,508 @@ +#!/bin/sh +# install - install a program, script, or datafile + +scriptversion=2014-09-12.12; # UTC + +# This originates from X11R5 (mit/util/scripts/install.sh), which was +# later released in X11R6 (xc/config/util/install.sh) with the +# following copyright and license. +# +# Copyright (C) 1994 X Consortium +# +# Permission is hereby granted, free of charge, to any person obtaining a copy +# of this software and associated documentation files (the "Software"), to +# deal in the Software without restriction, including without limitation the +# rights to use, copy, modify, merge, publish, distribute, sublicense, and/or +# sell copies of the Software, and to permit persons to whom the Software is +# furnished to do so, subject to the following conditions: +# +# The above copyright notice and this permission notice shall be included in +# all copies or substantial portions of the Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +# X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN +# AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNEC- +# TION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +# +# Except as contained in this notice, the name of the X Consortium shall not +# be used in advertising or otherwise to promote the sale, use or other deal- +# ings in this Software without prior written authorization from the X Consor- +# tium. +# +# +# FSF changes to this file are in the public domain. +# +# Calling this script install-sh is preferred over install.sh, to prevent +# 'make' implicit rules from creating a file called install from it +# when there is no Makefile. +# +# This script is compatible with the BSD install script, but was written +# from scratch. + +tab=' ' +nl=' +' +IFS=" $tab$nl" + +# Set DOITPROG to "echo" to test this script. + +doit=${DOITPROG-} +doit_exec=${doit:-exec} + +# Put in absolute file names if you don't have them in your path; +# or use environment vars. + +chgrpprog=${CHGRPPROG-chgrp} +chmodprog=${CHMODPROG-chmod} +chownprog=${CHOWNPROG-chown} +cmpprog=${CMPPROG-cmp} +cpprog=${CPPROG-cp} +mkdirprog=${MKDIRPROG-mkdir} +mvprog=${MVPROG-mv} +rmprog=${RMPROG-rm} +stripprog=${STRIPPROG-strip} + +posix_mkdir= + +# Desired mode of installed file. +mode=0755 + +chgrpcmd= +chmodcmd=$chmodprog +chowncmd= +mvcmd=$mvprog +rmcmd="$rmprog -f" +stripcmd= + +src= +dst= +dir_arg= +dst_arg= + +copy_on_change=false +is_target_a_directory=possibly + +usage="\ +Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE + or: $0 [OPTION]... SRCFILES... DIRECTORY + or: $0 [OPTION]... -t DIRECTORY SRCFILES... + or: $0 [OPTION]... -d DIRECTORIES... + +In the 1st form, copy SRCFILE to DSTFILE. +In the 2nd and 3rd, copy all SRCFILES to DIRECTORY. +In the 4th, create DIRECTORIES. + +Options: + --help display this help and exit. + --version display version info and exit. + + -c (ignored) + -C install only if different (preserve the last data modification time) + -d create directories instead of installing files. + -g GROUP $chgrpprog installed files to GROUP. + -m MODE $chmodprog installed files to MODE. + -o USER $chownprog installed files to USER. + -s $stripprog installed files. + -t DIRECTORY install into DIRECTORY. + -T report an error if DSTFILE is a directory. + +Environment variables override the default commands: + CHGRPPROG CHMODPROG CHOWNPROG CMPPROG CPPROG MKDIRPROG MVPROG + RMPROG STRIPPROG +" + +while test $# -ne 0; do + case $1 in + -c) ;; + + -C) copy_on_change=true;; + + -d) dir_arg=true;; + + -g) chgrpcmd="$chgrpprog $2" + shift;; + + --help) echo "$usage"; exit $?;; + + -m) mode=$2 + case $mode in + *' '* | *"$tab"* | *"$nl"* | *'*'* | *'?'* | *'['*) + echo "$0: invalid mode: $mode" >&2 + exit 1;; + esac + shift;; + + -o) chowncmd="$chownprog $2" + shift;; + + -s) stripcmd=$stripprog;; + + -t) + is_target_a_directory=always + dst_arg=$2 + # Protect names problematic for 'test' and other utilities. + case $dst_arg in + -* | [=\(\)!]) dst_arg=./$dst_arg;; + esac + shift;; + + -T) is_target_a_directory=never;; + + --version) echo "$0 $scriptversion"; exit $?;; + + --) shift + break;; + + -*) echo "$0: invalid option: $1" >&2 + exit 1;; + + *) break;; + esac + shift +done + +# We allow the use of options -d and -T together, by making -d +# take the precedence; this is for compatibility with GNU install. + +if test -n "$dir_arg"; then + if test -n "$dst_arg"; then + echo "$0: target directory not allowed when installing a directory." >&2 + exit 1 + fi +fi + +if test $# -ne 0 && test -z "$dir_arg$dst_arg"; then + # When -d is used, all remaining arguments are directories to create. + # When -t is used, the destination is already specified. + # Otherwise, the last argument is the destination. Remove it from $@. + for arg + do + if test -n "$dst_arg"; then + # $@ is not empty: it contains at least $arg. + set fnord "$@" "$dst_arg" + shift # fnord + fi + shift # arg + dst_arg=$arg + # Protect names problematic for 'test' and other utilities. + case $dst_arg in + -* | [=\(\)!]) dst_arg=./$dst_arg;; + esac + done +fi + +if test $# -eq 0; then + if test -z "$dir_arg"; then + echo "$0: no input file specified." >&2 + exit 1 + fi + # It's OK to call 'install-sh -d' without argument. + # This can happen when creating conditional directories. + exit 0 +fi + +if test -z "$dir_arg"; then + if test $# -gt 1 || test "$is_target_a_directory" = always; then + if test ! -d "$dst_arg"; then + echo "$0: $dst_arg: Is not a directory." >&2 + exit 1 + fi + fi +fi + +if test -z "$dir_arg"; then + do_exit='(exit $ret); exit $ret' + trap "ret=129; $do_exit" 1 + trap "ret=130; $do_exit" 2 + trap "ret=141; $do_exit" 13 + trap "ret=143; $do_exit" 15 + + # Set umask so as not to create temps with too-generous modes. + # However, 'strip' requires both read and write access to temps. + case $mode in + # Optimize common cases. + *644) cp_umask=133;; + *755) cp_umask=22;; + + *[0-7]) + if test -z "$stripcmd"; then + u_plus_rw= + else + u_plus_rw='% 200' + fi + cp_umask=`expr '(' 777 - $mode % 1000 ')' $u_plus_rw`;; + *) + if test -z "$stripcmd"; then + u_plus_rw= + else + u_plus_rw=,u+rw + fi + cp_umask=$mode$u_plus_rw;; + esac +fi + +for src +do + # Protect names problematic for 'test' and other utilities. + case $src in + -* | [=\(\)!]) src=./$src;; + esac + + if test -n "$dir_arg"; then + dst=$src + dstdir=$dst + test -d "$dstdir" + dstdir_status=$? + else + + # Waiting for this to be detected by the "$cpprog $src $dsttmp" command + # might cause directories to be created, which would be especially bad + # if $src (and thus $dsttmp) contains '*'. + if test ! -f "$src" && test ! -d "$src"; then + echo "$0: $src does not exist." >&2 + exit 1 + fi + + if test -z "$dst_arg"; then + echo "$0: no destination specified." >&2 + exit 1 + fi + dst=$dst_arg + + # If destination is a directory, append the input filename; won't work + # if double slashes aren't ignored. + if test -d "$dst"; then + if test "$is_target_a_directory" = never; then + echo "$0: $dst_arg: Is a directory" >&2 + exit 1 + fi + dstdir=$dst + dst=$dstdir/`basename "$src"` + dstdir_status=0 + else + dstdir=`dirname "$dst"` + test -d "$dstdir" + dstdir_status=$? + fi + fi + + obsolete_mkdir_used=false + + if test $dstdir_status != 0; then + case $posix_mkdir in + '') + # Create intermediate dirs using mode 755 as modified by the umask. + # This is like FreeBSD 'install' as of 1997-10-28. + umask=`umask` + case $stripcmd.$umask in + # Optimize common cases. + *[2367][2367]) mkdir_umask=$umask;; + .*0[02][02] | .[02][02] | .[02]) mkdir_umask=22;; + + *[0-7]) + mkdir_umask=`expr $umask + 22 \ + - $umask % 100 % 40 + $umask % 20 \ + - $umask % 10 % 4 + $umask % 2 + `;; + *) mkdir_umask=$umask,go-w;; + esac + + # With -d, create the new directory with the user-specified mode. + # Otherwise, rely on $mkdir_umask. + if test -n "$dir_arg"; then + mkdir_mode=-m$mode + else + mkdir_mode= + fi + + posix_mkdir=false + case $umask in + *[123567][0-7][0-7]) + # POSIX mkdir -p sets u+wx bits regardless of umask, which + # is incompatible with FreeBSD 'install' when (umask & 300) != 0. + ;; + *) + # $RANDOM is not portable (e.g. dash); use it when possible to + # lower collision chance + tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$ + trap 'ret=$?; rmdir "$tmpdir/a/b" "$tmpdir/a" "$tmpdir" 2>/dev/null; exit $ret' 0 + + # As "mkdir -p" follows symlinks and we work in /tmp possibly; so + # create the $tmpdir first (and fail if unsuccessful) to make sure + # that nobody tries to guess the $tmpdir name. + if (umask $mkdir_umask && + $mkdirprog $mkdir_mode "$tmpdir" && + exec $mkdirprog $mkdir_mode -p -- "$tmpdir/a/b") >/dev/null 2>&1 + then + if test -z "$dir_arg" || { + # Check for POSIX incompatibilities with -m. + # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or + # other-writable bit of parent directory when it shouldn't. + # FreeBSD 6.1 mkdir -m -p sets mode of existing directory. + test_tmpdir="$tmpdir/a" + ls_ld_tmpdir=`ls -ld "$test_tmpdir"` + case $ls_ld_tmpdir in + d????-?r-*) different_mode=700;; + d????-?--*) different_mode=755;; + *) false;; + esac && + $mkdirprog -m$different_mode -p -- "$test_tmpdir" && { + ls_ld_tmpdir_1=`ls -ld "$test_tmpdir"` + test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1" + } + } + then posix_mkdir=: + fi + rmdir "$tmpdir/a/b" "$tmpdir/a" "$tmpdir" + else + # Remove any dirs left behind by ancient mkdir implementations. + rmdir ./$mkdir_mode ./-p ./-- "$tmpdir" 2>/dev/null + fi + trap '' 0;; + esac;; + esac + + if + $posix_mkdir && ( + umask $mkdir_umask && + $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir" + ) + then : + else + + # The umask is ridiculous, or mkdir does not conform to POSIX, + # or it failed possibly due to a race condition. Create the + # directory the slow way, step by step, checking for races as we go. + + case $dstdir in + /*) prefix='/';; + [-=\(\)!]*) prefix='./';; + *) prefix='';; + esac + + oIFS=$IFS + IFS=/ + set -f + set fnord $dstdir + shift + set +f + IFS=$oIFS + + prefixes= + + for d + do + test X"$d" = X && continue + + prefix=$prefix$d + if test -d "$prefix"; then + prefixes= + else + if $posix_mkdir; then + (umask=$mkdir_umask && + $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir") && break + # Don't fail if two instances are running concurrently. + test -d "$prefix" || exit 1 + else + case $prefix in + *\'*) qprefix=`echo "$prefix" | sed "s/'/'\\\\\\\\''/g"`;; + *) qprefix=$prefix;; + esac + prefixes="$prefixes '$qprefix'" + fi + fi + prefix=$prefix/ + done + + if test -n "$prefixes"; then + # Don't fail if two instances are running concurrently. + (umask $mkdir_umask && + eval "\$doit_exec \$mkdirprog $prefixes") || + test -d "$dstdir" || exit 1 + obsolete_mkdir_used=true + fi + fi + fi + + if test -n "$dir_arg"; then + { test -z "$chowncmd" || $doit $chowncmd "$dst"; } && + { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } && + { test "$obsolete_mkdir_used$chowncmd$chgrpcmd" = false || + test -z "$chmodcmd" || $doit $chmodcmd $mode "$dst"; } || exit 1 + else + + # Make a couple of temp file names in the proper directory. + dsttmp=$dstdir/_inst.$$_ + rmtmp=$dstdir/_rm.$$_ + + # Trap to clean up those temp files at exit. + trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0 + + # Copy the file name to the temp name. + (umask $cp_umask && $doit_exec $cpprog "$src" "$dsttmp") && + + # and set any options; do chmod last to preserve setuid bits. + # + # If any of these fail, we abort the whole thing. If we want to + # ignore errors from any of these, just make sure not to ignore + # errors from the above "$doit $cpprog $src $dsttmp" command. + # + { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } && + { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } && + { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } && + { test -z "$chmodcmd" || $doit $chmodcmd $mode "$dsttmp"; } && + + # If -C, don't bother to copy if it wouldn't change the file. + if $copy_on_change && + old=`LC_ALL=C ls -dlL "$dst" 2>/dev/null` && + new=`LC_ALL=C ls -dlL "$dsttmp" 2>/dev/null` && + set -f && + set X $old && old=:$2:$4:$5:$6 && + set X $new && new=:$2:$4:$5:$6 && + set +f && + test "$old" = "$new" && + $cmpprog "$dst" "$dsttmp" >/dev/null 2>&1 + then + rm -f "$dsttmp" + else + # Rename the file to the real destination. + $doit $mvcmd -f "$dsttmp" "$dst" 2>/dev/null || + + # The rename failed, perhaps because mv can't rename something else + # to itself, or perhaps because mv is so ancient that it does not + # support -f. + { + # Now remove or move aside any old file at destination location. + # We try this two ways since rm can't unlink itself on some + # systems and the destination file might be busy for other + # reasons. In this case, the final cleanup might fail but the new + # file should still install successfully. + { + test ! -f "$dst" || + $doit $rmcmd -f "$dst" 2>/dev/null || + { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null && + { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; } + } || + { echo "$0: cannot unlink or rename $dst" >&2 + (exit 1); exit 1 + } + } && + + # Now rename the file to the real destination. + $doit $mvcmd "$dsttmp" "$dst" + } + fi || exit 1 + + trap '' 0 + fi +done + +# Local variables: +# eval: (add-hook 'write-file-hooks 'time-stamp) +# time-stamp-start: "scriptversion=" +# time-stamp-format: "%:y-%02m-%02d.%02H" +# time-stamp-time-zone: "UTC" +# time-stamp-end: "; # UTC" +# End: diff --git a/build-aux/subdirmk.in b/build-aux/subdirmk.in new file mode 100644 index 0000000..33d9875 --- /dev/null +++ b/build-aux/subdirmk.in @@ -0,0 +1,32 @@ +### -*-makefile-gmake-*- +### +### Stub subdirectory makefile +### +### (c) 2019 Mark Wooding +### + +###----- Licensing notice --------------------------------------------------- +### +### This program is free software; you can redistribute it and/or modify +### it under the terms of the GNU Library General Public License as +### published by the Free Software Foundation; either version 2 of the +### License, or (at your option) any later version. +### +### This program is distributed in the hope that it will be useful, +### but WITHOUT ANY WARRANTY; without even the implied warranty of +### MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +### GNU Library General Public License for more details. +### +### You should have received a copy of the GNU Library General Public +### License along with this program; if not, write to the Free +### Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, +### MA 02111-1307, USA. + +all: + +srcdir = @srcdir@ +top_srcdir = @top_srcdir@ +top_builddir = @top_builddir@ + +subdir = $(patsubst $(top_srcdir)/%,%, $(srcdir)) +%:; $(MAKE) -C$(top_builddir) SUBDIR=$(subdir) $@ diff --git a/configure.ac b/configure.ac new file mode 100644 index 0000000..ae55373 --- /dev/null +++ b/configure.ac @@ -0,0 +1,42 @@ +dnl -*-autoconf-*- +dnl +dnl Configuration script for toy project +dnl +dnl (c) 2019 Mark Wooding +dnl + +dnl----- Licensing notice --------------------------------------------------- +dnl +dnl This program is free software; you can redistribute it and/or modify +dnl it under the terms of the GNU Library General Public License as +dnl published by the Free Software Foundation; either version 2 of the +dnl License, or (at your option) any later version. +dnl +dnl This program is distributed in the hope that it will be useful, +dnl but WITHOUT ANY WARRANTY; without even the implied warranty of +dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +dnl GNU Library General Public License for more details. +dnl +dnl You should have received a copy of the GNU Library General Public +dnl License along with this program; if not, write to the Free +dnl Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, +dnl MA 02111-1307, USA. + +AC_INIT([mktoy], [0.9.0], [mdw@distorted.org.uk]) +AC_CONFIG_SRCDIR([src/toy.c]) +AC_CONFIG_AUX_DIR([build-aux]) + +AC_PROG_INSTALL + +AC_PROG_CC +INCLUDES= +AC_SUBST(INCLUDES) + +AC_CONFIG_FILES( + [Makefile] + [lib/Makefile] + [lib/t/Makefile] + [src/Makefile]) +AC_OUTPUT + +dnl----- That's all, folks -------------------------------------------------- diff --git a/lib/Makefile.in b/lib/Makefile.in new file mode 120000 index 0000000..519a8df --- /dev/null +++ b/lib/Makefile.in @@ -0,0 +1 @@ +../build-aux/subdirmk.in \ No newline at end of file diff --git a/lib/Subdir.mk b/lib/Subdir.mk new file mode 100644 index 0000000..eba1ce1 --- /dev/null +++ b/lib/Subdir.mk @@ -0,0 +1,37 @@ +### -*-makefile-gmake-*- +### +### Build script for library +### +### (c) 2019 Mark Wooding +### + +###----- Licensing notice --------------------------------------------------- +### +### This program is free software; you can redistribute it and/or modify +### it under the terms of the GNU Library General Public License as +### published by the Free Software Foundation; either version 2 of the +### License, or (at your option) any later version. +### +### This program is distributed in the hope that it will be useful, +### but WITHOUT ANY WARRANTY; without even the implied warranty of +### MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +### GNU Library General Public License for more details. +### +### You should have received a copy of the GNU Library General Public +### License along with this program; if not, write to the Free +### Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, +### MA 02111-1307, USA. + +$D/all:: $D/libtoy.a +$D_CLEANFILES := + +libtoy_SOURCES := $(addprefix $D/, toylib.c) +libtoy_OBJECTS := $(call objects, $(libtoy_SOURCES)) +$(call notice-objects, $(libtoy_OBJECTS)) + +$D/libtoy.a: $(libtoy_OBJECTS) + $(call v-tag,AR)ar rc $@ $^ +$D_CLEANFILES += $D/libtoy.a + +SUBDIRS = t +$(call descend-subdirs, $(SUBDIRS)) diff --git a/lib/t/Makefile.in b/lib/t/Makefile.in new file mode 120000 index 0000000..7137858 --- /dev/null +++ b/lib/t/Makefile.in @@ -0,0 +1 @@ +../../build-aux/subdirmk.in \ No newline at end of file diff --git a/lib/t/Subdir.mk b/lib/t/Subdir.mk new file mode 100644 index 0000000..a35f479 --- /dev/null +++ b/lib/t/Subdir.mk @@ -0,0 +1,41 @@ +### -*-makefile-gmake-*- +### +### Build script for library test +### +### (c) 2019 Mark Wooding +### + +###----- Licensing notice --------------------------------------------------- +### +### This program is free software; you can redistribute it and/or modify +### it under the terms of the GNU Library General Public License as +### published by the Free Software Foundation; either version 2 of the +### License, or (at your option) any later version. +### +### This program is distributed in the hope that it will be useful, +### but WITHOUT ANY WARRANTY; without even the implied warranty of +### MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +### GNU Library General Public License for more details. +### +### You should have received a copy of the GNU Library General Public +### License along with this program; if not, write to the Free +### Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, +### MA 02111-1307, USA. + +$D_CLEANFILES := + +$D/check:: $D/toytest.stamp + +toytest_SOURCES := $(addprefix $D/, toytest.c) +toytest_OBJECTS := $(call objects, $(toytest_SOURCES)) +toytest_LIBS = lib/libtoy.a +$(call notice-objects, $(toytest_OBJECTS)) + +$D/toytest: $(toytest_OBJECTS) $(toytest_LIBS) + $(LINK) $^ +$D_CLEANFILES += $D/toytest + +$D/toytest.stamp: $D/toytest + $< + touch $@ +$D_CLEANFILES += $D/toytest.stamp diff --git a/lib/t/toytest.c b/lib/t/toytest.c new file mode 100644 index 0000000..233a429 --- /dev/null +++ b/lib/t/toytest.c @@ -0,0 +1,18 @@ +#include +#include +#include + +#include "toylib.h" + +int main(void) +{ + const char *p; + + p = greeting(); + if (!STRNCMP(p, ==, "Hello", 5)) { + fprintf(stderr, "greeting `%s' has bad salutation\n", p); + exit(1); + } + printf("all ok\n"); + return (0); +} diff --git a/lib/toylib.c b/lib/toylib.c new file mode 100644 index 0000000..084266d --- /dev/null +++ b/lib/toylib.c @@ -0,0 +1,4 @@ +#include "toylib.h" + +const char *greeting(void) + { return "Hello, world!\n"; } diff --git a/lib/toylib.h b/lib/toylib.h new file mode 100644 index 0000000..122e3fc --- /dev/null +++ b/lib/toylib.h @@ -0,0 +1,12 @@ +#ifndef LIBTOY_H +#define LIBTOY_H + +#include + +#define STRCMP(x, op, y) (strcmp((x), (y)) op 0) +#define STRNCMP(x, op, y, n) (strncmp((x), (y), (n)) op 0) +#define MEMCMP(x, op, y, n) (memcmp((x), (y), (n)) op 0) + +extern const char *greeting(void); + +#endif diff --git a/src/Makefile.in b/src/Makefile.in new file mode 120000 index 0000000..519a8df --- /dev/null +++ b/src/Makefile.in @@ -0,0 +1 @@ +../build-aux/subdirmk.in \ No newline at end of file diff --git a/src/Subdir.mk b/src/Subdir.mk new file mode 100644 index 0000000..8c9acd4 --- /dev/null +++ b/src/Subdir.mk @@ -0,0 +1,35 @@ +### -*-makefile-gmake-*- +### +### Build script for main program +### +### (c) 2019 Mark Wooding +### + +###----- Licensing notice --------------------------------------------------- +### +### This program is free software; you can redistribute it and/or modify +### it under the terms of the GNU Library General Public License as +### published by the Free Software Foundation; either version 2 of the +### License, or (at your option) any later version. +### +### This program is distributed in the hope that it will be useful, +### but WITHOUT ANY WARRANTY; without even the implied warranty of +### MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +### GNU Library General Public License for more details. +### +### You should have received a copy of the GNU Library General Public +### License along with this program; if not, write to the Free +### Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, +### MA 02111-1307, USA. + +$D/all:: $D/toy +$D_CLEANFILES := + +toy_SOURCES := $(addprefix $D/, toy.c) +toy_OBJECTS := $(call objects, $(toy_SOURCES)) +toy_LIBS = lib/libtoy.a +$(call notice-objects, $(toy_OBJECTS)) + +$D/toy: $(toy_OBJECTS) $(toy_LIBS) + $(LINK) $^ +$D_CLEANFILES += $D/toy diff --git a/src/toy.c b/src/toy.c new file mode 100644 index 0000000..41ec14f --- /dev/null +++ b/src/toy.c @@ -0,0 +1,5 @@ +#include +#include "toylib.h" + +int main(void) + { fputs(greeting(), stdout); return (0); } -- 2.30.2