Reorganize build system to support -mfastcall capable compilers

This also now puts all libraries & code into the build directory.
Empty directories lib, lib020 etc. can safely be removed

Author: th-otto

.gitignore

@@ -158,3 +158,4 @@ unix/test-vfork
 *.a
 *~
 *.exe
+build

.scripts/build.sh

@@ -4,7 +4,7 @@
 # -x: Display expanded script commands
 
 make SHELL=/bin/bash
-make SHELL=/bin/bash prefix="${INSTALL_DIR}" install
+make SHELL=/bin/bash DESTDIR="${INSTALL_DIR}" install
 
 find "${INSTALL_DIR}" -type f -perm -a=x -exec m68k-atari-mint-strip -s {} \;
 find "${INSTALL_DIR}" -type f \( -name '*.a' -o -name '*.o' \) -exec m68k-atari-mint-strip -S -X -w -N '.L[0-9]*' {} \;

Makefile

@@ -23,40 +23,37 @@ endif
 
 SUBDIRS = include syscall startup argp conf crypt dirent gmp login mintlib \
   misc multibyte posix pwdgrp shadow signal socket stdiio stdio stdlib \
-  string sysvipc termios time unix lib tz sunrpc
-DIST_SUBDIRS = argp conf crypt dirent gmp include lib \
+  string sysvipc termios time unix
+DIST_SUBDIRS = argp conf crypt dirent gmp include \
   login mintlib misc multibyte posix pwdgrp shadow signal socket startup \
   stdiio stdio stdlib string sunrpc syscall sysvipc termios time tz unix
 TEST_SUBDIRS = argp crypt dirent login mintlib misc posix pwdgrp shadow signal \
   socket startup stdiio stdio stdlib string time tz unix
 
-ifeq ($(WITH_PROFILE_LIB), yes)
-  SUBDIRS += lib_p
-  DIST_SUBDIRS += lib_p
+BASE_FLAVOURS = m68000
+ifeq ($(WITH_020_LIB), yes)
+  BASE_FLAVOURS += m68020
+endif
+ifeq ($(WITH_V4E_LIB), yes)
+  BASE_FLAVOURS += coldfire
 endif
+FLAVOURS = $(BASE_FLAVOURS)
 
+ifeq ($(WITH_PROFILE_LIB), yes)
+  FLAVOURS += $(addsuffix -profile,$(BASE_FLAVOURS))
+endif
 ifeq ($(WITH_DEBUG_LIB), yes)
-  SUBDIRS += lib_g
-  DIST_SUBDIRS += lib_g
+  FLAVOURS += $(addsuffix -debug,$(BASE_FLAVOURS))
 endif
-
-ifeq ($(WITH_020_LIB), yes)
-  SUBDIRS += lib020
-  DIST_SUBDIRS += lib020
-  ifeq ($(WITH_DEBUG_LIB), yes)
-    SUBDIRS += lib020_g
-    DIST_SUBDIRS += lib020_g
-  endif
+ifeq ($(WITH_FASTCALL), yes)
+  FLAVOURS += $(addsuffix -fastcall,$(BASE_FLAVOURS))
 endif
 
-ifeq ($(WITH_V4E_LIB), yes)
-  SUBDIRS += libv4e
-  DIST_SUBDIRS += libv4e
-  ifeq ($(WITH_DEBUG_LIB), yes)
-    SUBDIRS += libv4e_g
-    DIST_SUBDIRS += libv4e_g
-  endif
-endif
+LIBDIRS += $(addprefix build/,$(FLAVOURS))
+
+SUBDIRS += $(LIBDIRS)
+# must come after lib dirs, since it needs the just-built library
+SUBDIRS += tz sunrpc
 
 include $(srcdir)/BINFILES
 include $(srcdir)/SRCFILES
@@ -69,7 +66,64 @@ include phony
 
 all: all-here all-recursive
 
-all-here:
+# the SRCFILES, EXTRAFILES, and MISCFILES are still required by
+# the rules; FIXME
+all-here: $(top_srcdir)/includepath
+	@for flavour in $(FLAVOURS); do \
+	   dir=build/$$flavour; \
+	   mkdir -p $$dir/.deps; \
+	   test -f $$dir/SRCFILES || touch $$dir/SRCFILES; \
+	   test -f $$dir/EXTRAFILES || touch $$dir/EXTRAFILES; \
+	   test -f $$dir/MISCFILES || touch $$dir/MISCFILES; \
+	   cflags=""; \
+	   nocflags=""; \
+	   qualifier=""; \
+	   cflags=""; \
+	   for f in `echo $$flavour | sed -e 's/-/ /g'`; do \
+	     case $$f in \
+	     profile) \
+	     	qualifier=_p; \
+	     	nocflags="-fomit-frame-pointer"; \
+	        cflags="$$cflags $(CFLAGS_profile)"; \
+	     	;; \
+	     debug) \
+	        qualifier=_g; \
+	        nocflags="-O2 -O3 -fomit-frame-pointer -fexpensive-optimizations"; \
+	        cflags="$$cflags $(CFLAGS_debug)"; \
+	        ;; \
+	     m68000) \
+	        cflags="$$cflags $(CFLAGS_m68000)"; \
+	        ;; \
+	     m68020) \
+	        cflags="$$cflags $(CFLAGS_m68020)"; \
+	        ;; \
+	     coldfire) \
+	        cflags="$$cflags $(CFLAGS_coldfire)"; \
+	        ;; \
+	     short) \
+	        cflags="$$cflags $(CFLAGS_short)"; \
+	        ;; \
+	     fastcall) \
+	        cflags="$$cflags $(CFLAGS_fastcall)"; \
+	        ;; \
+	     esac; \
+	   done; \
+	   instdir=`$(CC) $$cflags -print-multi-directory`; \
+	   test -f $$dir/BINFILES || echo "BINFILES = libc$${qualifier}.a libiio$${qualifier}.a" > $$dir/BINFILES; \
+	   ( echo "SHELL = /bin/sh"; \
+	     echo "srcdir = ."; \
+	     echo "top_srcdir = ../.."; \
+	     echo "subdir = $$dir"; \
+	     echo "qualifier = $$qualifier"; \
+	     echo "cflags = $$cflags"; \
+	     echo "nocflags = $$nocflags"; \
+	     echo "instdir = $$instdir"; \
+	     echo ""; \
+	     echo "default: all"; \
+	     echo ""; \
+	     echo 'include $$(top_srcdir)/buildrules'; \
+	   ) > $$dir/Makefile; \
+	done
 
 install: all-here install-recursive zoneswarning
 
@@ -84,7 +138,7 @@ install-headers: install-include-recursive
 install-man: all install-man-recursive
 
 clean:: clean-recursive
-	rm -rf .deps includepath CFILES
+	rm -rf .deps includepath CFILES build
 
 distclean:: distclean-recursive
 
@@ -100,6 +154,17 @@ bindistdir = $(distdir)-bin
 topdistdir = $(distdir)
 topbindistdir = $(topdistdir)-bin
 
+$(top_srcdir)/includepath: $(top_srcdir)/configvars
+	@echo "Generating $@"; \
+	installdir=`$(CC) --print-search-dirs | awk '{ print $$2; exit; }'`; \
+	echo "$${installdir}include -I$${installdir}include-fixed" >$@
+	@if [ -z "$$(<$@)" ]; then \
+	  rm $@; \
+	  echo "error: The syntax \$$(<file) is unsupported by $(SHELL)." >&2; \
+	  echo "       Please use \"$(MAKE) SHELL=/bin/bash\" instead." >&2; \
+	  exit 1; \
+	fi
+	
 dist-check:
 	@echo "WARNING: This will take VERY long and will consume"
 	@echo "VERY much diskspace!!!"
@@ -175,7 +240,9 @@ uninstall-include-recursive uninstall-man-recursive:
 	   echo "attempting to install on host; aborting" >&2; \
            exit 1; \
 	fi; \
-	list='$(SUBDIRS)'; for subdir in $$list; do \
+	list='$(SUBDIRS)'; \
+	if test "$@" = clean-recursive; then list='$(filter-out $(LIBDIRS),$(SUBDIRS))'; fi; \
+	for subdir in $$list; do \
 	  target=`echo $@ | sed s/-recursive//`; \
 	  echo "Making $$target in $$subdir"; \
 	  (cd $$subdir && $(MAKE) $$target) \

argp/Makefile

@@ -11,7 +11,7 @@ SHELL = /bin/sh
 
 srcdir = .
 top_srcdir = ..
-subdir = argp 
+subdir = argp
 
 SUBDIRS =
 

buildrules

@@ -16,11 +16,15 @@ am__v_AR_0 = @echo "  AR    " $@;
 AM_V_RANLIB = $(am__v_RANLIB_$(V))
 am__v_RANLIB_ = $(am__v_RANLIB_$(AM_DEFAULT_VERBOSITY))
 am__v_RANLIB_0 = @echo "  RANLIB" $@;
+AM_V_STRIP = $(am__v_STRIP_$(V))
+am__v_STRIP_ = $(am__v_STRIP_$(AM_DEFAULT_VERBOSITY))
+am__v_STRIP_0 = @echo "  STRIP " $@;
 
 # This is the slow part of the Makefiles.  Exclude it if we build
 # binary distributions.
 ifndef top_distdir
 
+# qualifier is _p, _g, or empty
 libc := libc$(qualifier).a
 libiio := libiio$(qualifier).a
 librpcsvc := librpcsvc$(qualifier).a
@@ -108,9 +112,6 @@ SRCS := $(ARGPSRCS) $(CRYPTSRCS) $(DIRENTSRCS) $(GMPSRCS) $(LOGINSRCS) $(MINTLIB
   $(STRINGSRCS) $(SUNRPCSRCS) $(SYSCALLSRCS) $(SYSVIPCSRCS) $(TERMIOSSRCS) \
   $(TIMESRCS) $(TZSRCS) $(UNIXSRCS)
 
-ifeq ($(libsize), _p)
-CFLAGS-_mon.S = -DPROFILING
-endif
 CFLAGS-crtinit.c = -fno-omit-frame-pointer --no-profile
 CFLAGS-gmon.c = -fno-omit-frame-pointer --no-profile
 CFLAGS-mcount.c = -fno-omit-frame-pointer --no-profile
@@ -187,29 +188,16 @@ vsscanf.o obstream.o printf.o vasprintf.o vdprintf.o vprintf.o vsnprintf.o \
 vsprintf.o sscanf.o fprintf.o fwprintf.o snprintf.o sprintf.o swprintf.o \
 vfwprintf.o vswprintf.o vwprintf.o wprintf.o
 
-DEP_FILES := $(addprefix $(top_srcdir)/.deps/,$(patsubst %.o,%.P,$(OBJS)))
+DEP_FILES := $(addprefix .deps/,$(patsubst %.o,%.P,$(OBJS)))
 
 # These are automatically remade, no need for make to worry about
 # them.
 .PHONY : $(DEP_FILES)
 
 endif  # not top_distdir.
 
-all-here: $(top_srcdir)/CFILES $(top_srcdir)/includepath $(CRT0OBJS) $(LIBS)
-
-$(top_srcdir)/includepath: $(top_srcdir)/configvars
-	@echo "Generating $@"; \
-	local= ; \
-	installdir=`$(CC) --print-search-dirs | awk '{ print $$2; exit; }'`; \
-	case $$installdir in /usr/local*) local=/local;; esac; \
-	echo "$${installdir}include -I$${installdir}include-fixed" >$@
-	@if [ -z "$$(<$@)" ]; then \
-	  rm $@; \
-	  echo "error: The syntax \$$(<file) is unsupported by $(SHELL)." >&2; \
-	  echo "       Please use \"$(MAKE) SHELL=/bin/bash\" instead." >&2; \
-	  exit 1; \
-	fi
-	
+all-here: $(top_srcdir)/CFILES $(CRT0OBJS) $(LIBS)
+
 include $(top_srcdir)/bindist
 
 install-include:
@@ -232,6 +220,7 @@ $(top_srcdir)/CFILES: $(argpdir)/SRCFILES $(cryptdir)/SRCFILES $(direntdir)/SRCF
   $(syscalldir)/SRCFILES $(sysvipcdir)/SRCFILES $(termiosdir)/SRCFILES \
   $(timedir)/SRCFILES $(tzdir)/SRCFILES $(unixdir)/SRCFILES
 	rm -f $@
+ifneq (clean,$(MAKECMDGOALS))
 	echo "# This file is a generated secondary file. Do not edit." >$@
 	sed -e 's,^SRCFILES *=,ARGPCFILES =,g' $(argpdir)/SRCFILES >>$@
 	sed -e 's,^SRCFILES *=,CRYPTCFILES =,g' $(cryptdir)/SRCFILES >>$@
@@ -260,6 +249,7 @@ $(top_srcdir)/CFILES: $(argpdir)/SRCFILES $(cryptdir)/SRCFILES $(direntdir)/SRCF
 	sed -e 's,^SRCFILES *=,TIMECFILES =,g' $(timedir)/SRCFILES >>$@
 	sed -e 's,^SRCFILES *=,TZCFILES =,g' $(tzdir)/SRCFILES >>$@
 	sed -e 's,^SRCFILES *=,UNIXCFILES =,g' $(unixdir)/SRCFILES >>$@
+endif
 
 vpath %.c $(srcdirs)
 vpath %.s $(srcdirs)
@@ -269,13 +259,13 @@ vpath %.S $(srcdirs)
 .SUFFIXES: .c .o .S .s
 
 .c.o:
-	$(AM_V_CC)$(COMPILE) -Wp,-MD,$(top_srcdir)/.deps/$(@:.o=.P) -c $< -o $@
+	$(AM_V_CC)$(COMPILE) -Wp,-MD,.deps/$(@:.o=.P) -c $< -o $@
 
 .S.o:
-	$(AM_V_CC)$(COMPILE) -Wp,-MD,$(top_srcdir)/.deps/$(@:.o=.P) -c $< -o $@
+	$(AM_V_CC)$(COMPILE) -Wp,-MD,.deps/$(@:.o=.P) -c $< -o $@
 
 .s.o:
-	$(AM_V_CC)$(COMPILE) -Wp,-MD,$(top_srcdir)/.deps/$(@:.o=.P) -c $< -o $@
+	$(AM_V_CC)$(COMPILE) -Wp,-MD,.deps/$(@:.o=.P) -c $< -o $@
 
 crt0.o: $(startupdir)/crt0.S
 	$(AM_V_CC)$(CC) $(WARN) $(cflags) $(CFLAGS) -nostdinc -I$(top_srcdir)/include -I$(top_srcdir)/mintlib -c $< -o $@
@@ -287,16 +277,19 @@ gcrt0.o: $(startupdir)/crt0.S
 $(libc): $(LIBCOBJS)
 	@rm -f $@
 	$(AM_V_AR)$(AR) cru $@ $(LIBCOBJS)
+	if test "$(qualifier)" = ""; then $(AM_V_STRIP)$(STRIP) -S -X -w -N '.L[0-9]*' $@; fi
 	$(AM_V_RANLIB)$(RANLIB) $@
 
 $(libiio): $(STDIIOOBJS) $(LIBIIO_ADDOBJS)
 	@rm -f $@
 	$(AM_V_AR)$(AR) cru $@ $(STDIIOOBJS) $(LIBIIO_ADDOBJS)
+	if test "$(qualifier)" = ""; then $(AM_V_STRIP)$(STRIP) -S -X -w -N '.L[0-9]*' $@; fi
 	$(AM_V_RANLIB)$(RANLIB) $@
 
 $(librpcsvc): $(RPCSVCOBJS)
 	@rm -f $@
 	$(AM_V_AR)$(AR) cru $@ $(RPCSVCOBJS)
+	if test "$(qualifier)" = ""; then $(AM_V_STRIP)$(STRIP) -S -X -w -N '.L[0-9]*' $@; fi
 	$(AM_V_RANLIB)$(RANLIB) $@
 
 $(LIBCOBJS) $(LIBIIO_ADDOBJS) $(RPCSVCOBJS): $(top_srcdir)/includepath
@@ -305,8 +298,6 @@ $(top_srcdir)/include/linker.h: $(top_srcdir)/include/linker.h.in \
   $(top_srcdir)/configvars
 	(cd $(top_srcdir)/include && $(MAKE) linker.h)
 
-DEPS_MAGIC := $(shell mkdir $(top_srcdir)/.deps > /dev/null 2>&1 || :)
-
 .SECONDARY : $(DEP_FILES) $(SRCFILES)
 
 -include $(DEP_FILES) /dev/null

checkrules

@@ -6,25 +6,25 @@ include $(top_srcdir)/configvars
 
 # The variable "type" will be appended to "lib" when searching for
 # libraries.  Thus, to test the library with fpu code and >=m68020, 
-# set type to 16020.  If you change this you must run "make checkclean".
-type=
+# set type to m68020.  If you change this you must run "make checkclean".
+type=m68000
 
 # These are additional CFLAGS passed to the compiler and the linker.
 # For fpu/m68020 libs:
 #	cflags=-m68020-60
 # If you change this you must run "make checkclean".
-cflags=
+cflags=$(CFLAGS_$(type))
 
-CRT0 = $(top_srcdir)/lib$(type)/crt0.o
-libs = $(libs-$(@F)) $(top_srcdir)/lib$(type)/libc.a
+CRT0 = $(top_srcdir)/build/$(type)/crt0.o
+libs = $(libs-$(@F)) $(top_srcdir)/build/$(type)/libc.a
 LIBS = -lgcc $(LIBS-$(@F)) $(libs) -lgcc
 
 TESTPRGS = $(addprefix test-, $(TESTS))
-TESTCFILES = $(addsuffix .c, $(TESTPRGS) $(EXTRAPRGS))
+TESTCFILES = $(addsuffix .c,$(TESTPRGS) $(EXTRAPRGS))
 TESTOBJS = $(TESTCFILES:.c=.o)
-DEP_FILES = $(addprefix $(srcdir)/.deps/, $(patsubst %.c,%.P,$(TESTCFILES)))
+DEP_FILES = $(addprefix $(top_srcdir)/build/$(type)/$(subdir)/.deps/,$(patsubst %.c,%.P,$(TESTCFILES)))
 
-TESTCFLAGS = $(cflags) $(EXTRACFLAGS)
+TESTCFLAGS = $(cflags) $(CFLAGS) $(EXTRACFLAGS)
 TESTLDFLAGS = $(cflags) -s -nostartfiles -nostdlib
 TESTDEFS = -D_GNU_SOURCE -D_REENTRANT
 
@@ -37,8 +37,8 @@ check: check-local $(libs) $(TESTPRGS)
 	$(top_srcdir)/do_test $(TESTS)
 
 checkclean:
-	rm -f $(srcdir)/*.o $(TESTPRGS) 
-	rm -rf $(srcdir)/.deps
+	rm -f $(top_srcdir)/build/$(type)/$(subdir)/*.o $(TESTPRGS) 
+	rm -rf $(top_srcdir)/build/$(type)/$(subdir)/.deps
 
 $(TESTPRGS) $(EXTRAPRGS): %: %.o $(libs) $(CRT0)
 	$(CC) $(LDFLAGS) $(TESTLDFLAGS) $(CRT0) $< -o $@ $(LIBS)
@@ -48,9 +48,8 @@ $(TESTPRGS) $(EXTRAPRGS): %: %.o $(libs) $(CRT0)
 
 .c.o:
 	@echo '$(COMPILE) -c $< -o $@'; \
-	$(COMPILE) -Wp,-MD,.deps/$(@:.o=.P) -c $< -o $@
+	$(COMPILE) -Wp,-MD,$(top_srcdir)/build/$(type)/$(subdir)/.deps/$(@:.o=.P) -c $< -o $@
 
-DEPS_MAGIC := $(shell mkdir $(srcdir)/.deps > /dev/null 2>&1 || :)
+DEPS_MAGIC := $(shell mkdir -p $(top_srcdir)/build/$(type)/$(subdir)/.deps > /dev/null 2>&1 || :)
 
 -include $(DEP_FILES) /dev/null
-