Shorten build script by using make metaprogramming

.gitignore

@@ -2,3 +2,4 @@
 *.a
 /library/compiler.log
 /library/netinclude
+*~

LICENSE

@@ -0,0 +1,29 @@
+BSD 3-Clause License
+
+Copyright (c) 2016, Olaf Barthel
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+* Redistributions of source code must retain the above copyright notice, this
+  list of conditions and the following disclaimer.
+
+* Redistributions in binary form must reproduce the above copyright notice,
+  this list of conditions and the following disclaimer in the documentation
+  and/or other materials provided with the distribution.
+
+* Neither the name of the copyright holder nor the names of its
+  contributors may be used to endorse or promote products derived from
+  this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

library/GNUmakefile.68k

@@ -1,7 +1,7 @@
 #
 # $Id: GNUmakefile.68k,v 1.107 2010-10-20 13:50:16 obarthel Exp $
 #
-# :ts=8
+# vim:ts=8 ft=make:
 #
 
 ##############################################################################
@@ -138,814 +138,16 @@ CFLAGS = \
 
 ##############################################################################
 
-C_LIB = \
+include libamiga.obj.gmk
-	c.lib_rev.o \
+include libc.obj.gmk
-	ctype_isalnum.o \
+include libdebug.obj.gmk
-	ctype_isalpha.o \
+include libm.obj.gmk
-	ctype_isascii.o \
+include libnet.obj.gmk
-	ctype_isblank.o \
+include libunix.obj.gmk
-	ctype_iscntrl.o \
-	ctype_isdigit.o \
-	ctype_isgraph.o \
-	ctype_islower.o \
-	ctype_isprint.o \
-	ctype_ispunct.o \
-	ctype_isspace.o \
-	ctype_isupper.o \
-	ctype_isxdigit.o \
-	ctype_table.o \
-	ctype_tolower.o \
-	ctype_toupper.o \
-	dirent_closedir.o \
-	dirent_opendir.o \
-	dirent_readdir.o \
-	dirent_rewinddir.o \
-	errno_data.o \
-	fcntl_close.o \
-	fcntl_creat.o \
-	fcntl_fcntl.o \
-	fcntl_get_default_file.o \
-	fcntl_lock.o \
-	fcntl_lseek.o \
-	fcntl_open.o \
-	fcntl_read.o \
-	fcntl_write.o \
-	ftw_ftw.o \
-	ftw_nftw.o \
-	inttypes_imaxdiv.o \
-	inttypes_imaxabs.o \
-	inttypes_strtoimax.o \
-	inttypes_strtoumax.o \
-	libgen_basename.o \
-	libgen_dirname.o \
-	locale_init_exit.o \
-	locale_localeconv.o \
-	locale_open_locale.o \
-	locale_setlocale.o \
-	mount_convertinfo.o \
-	mount_fstatfs.o \
-	mount_statfs.o \
-	signal_checkabort.o \
-	signal_data.o \
-	signal_kill.o \
-	signal_mask.o \
-	signal_raise.o \
-	signal_sigaddset.o \
-	signal_sigblock.o \
-	signal_sigemptyset.o \
-	signal_sigmask.o \
-	signal_signal.o \
-	signal_sigprocmask.o \
-	signal_sigsetmask.o \
-	stat_chmod.o \
-	stat_convertfileinfo.o \
-	stat_fchmod.o \
-	stat_fstat.o \
-	stat_lstat.o \
-	stat_lock.o \
-	stat_mkdir.o \
-	stat_rmdir.o \
-	stat_stat.o \
-	stat_umask.o \
-	stdio_asprintf.o \
-	stdio_change_fd_action.o \
-	stdio_change_fd_user_data.o \
-	stdio_clearerr.o \
-	stdio_dropiobreadbuffer.o \
-	stdio_duplicate_fd.o \
-	stdio_examine_fh.o \
-	stdio_fclose.o \
-	stdio_fdhookentry.o \
-	stdio_feof.o \
-	stdio_ferror.o \
-	stdio_fflush.o \
-	stdio_fgetc.o \
-	stdio_fgetpos.o \
-	stdio_fgets.o \
-	stdio_filliobreadbuffer.o \
-	stdio_findvacantfdentry.o \
-	stdio_findvacantiobentry.o \
-	stdio_flockfile.o \
-	stdio_flush.o \
-	stdio_flush_all_files.o \
-	stdio_flushiobwritebuffer.o \
-	stdio_fopen.o \
-	stdio_fprintf.o \
-	stdio_fputc.o \
-	stdio_fputs.o \
-	stdio_fread.o \
-	stdio_freopen.o \
-	stdio_fscanf.o \
-	stdio_fseek.o \
-	stdio_fseeko.o \
-	stdio_fsetpos.o \
-	stdio_ftell.o \
-	stdio_ftello.o \
-	stdio_ftrylockfile.o \
-	stdio_funlockfile.o \
-	stdio_fwrite.o \
-	stdio_getc.o \
-	stdio_getc_unlocked.o \
-	stdio_getchar.o \
-	stdio_getchar_unlocked.o \
-	stdio_gets.o \
-	stdio_get_fd.o \
-	stdio_get_file_descriptor.o \
-	stdio_growfdtable.o \
-	stdio_growiobtable.o \
-	stdio_grow_file.o \
-	stdio_initializefd.o \
-	stdio_initializeiob.o \
-	stdio_init_exit.o \
-	stdio_file_init.o \
-	stdio_iobhookentry.o \
-	stdio_lock.o \
-	stdio_locksemaphorename.o \
-	stdio_nostdio.o \
-	stdio_openiob.o \
-	stdio_parent_of_fh.o \
-	stdio_perror.o \
-	stdio_popen.o \
-	stdio_printf.o \
-	stdio_putc.o \
-	stdio_putc_unlocked.o \
-	stdio_putchar.o \
-	stdio_putchar_unlocked.o \
-	stdio_puts.o \
-	stdio_remove.o \
-	stdio_remove_fd_alias.o \
-	stdio_rename.o \
-	stdio_resolve_fd_file.o \
-	stdio_rewind.o \
-	stdio_scanf.o \
-	stdio_setbuf.o \
-	stdio_setvbuf.o \
-	stdio_snprintf.o \
-	stdio_sprintf.o \
-	stdio_sscanf.o \
-	stdio_sscanf_hook_entry.o \
-	stdio_tmpfile.o \
-	stdio_tmpnam.o \
-	stdio_translateioerror.o \
-	stdio_ungetc.o \
-	stdio_unlockfile.o \
-	stdio_vasprintf.o \
-	stdio_vasprintf_hook_entry.o \
-	stdio_vfprintf.o \
-	stdio_vfscanf.o \
-	stdio_vprintf.o \
-	stdio_vsnprintf.o \
-	stdio_vsnprintf_hook_entry.o \
-	stdio_vsprintf.o \
-	stdio_vsprintf_hook_entry.o \
-	stdio_vsscanf.o \
-	stdio_vscanf.o \
-	stdlib_abort.o \
-	stdlib_abs.o \
-	stdlib_alloca.o \
-	stdlib_alloca_cleanup.o \
-	stdlib_alloca_trap.o \
-	stdlib_assertion_failure.o \
-	stdlib_atexit.o \
-	stdlib_atoi.o \
-	stdlib_atol.o \
-	stdlib_atoll.o \
-	stdlib_bsearch.o \
-	stdlib_calloc.o \
-	stdlib_checkdetach.o \
-	stdlib_constructor.o \
-	stdlib_constructor_begin.o \
-	stdlib_default_pool_size.o \
-	stdlib_default_puddle_size.o \
-	stdlib_destructor.o \
-	stdlib_detach.o \
-	stdlib_disablerequesters.o \
-	stdlib_div.o \
-	stdlib_divsi3.o \
-	stdlib_divsi4.o \
-	stdlib_dosbase.o \
-	stdlib_exit.o \
-	stdlib_free.o \
-	stdlib_free_unused_slabs.o \
-	stdlib_decay_unused_slabs.o \
-	stdlib_getdefstacksize.o \
-	stdlib_getenv.o \
-	stdlib_getmemstats.o \
-	stdlib_getsp.o \
-	stdlib_get_errno.o \
-	stdlib_get_slab_usage.o \
-	stdlib_get_slab_allocations.o \
-	stdlib_get_slab_stats.o \
-	stdlib_isresident.o \
-	stdlib_labs.o \
-	stdlib_llabs.o \
-	stdlib_ldiv.o \
-	stdlib_lldiv.o \
-	stdlib_lib_main.o \
-	stdlib_lib_startup.o \
-	stdlib_machine_test.o \
-	stdlib_main.o \
-	stdlib_main_stub.o \
-	stdlib_malloc.o \
-	stdlib_math.o \
-	stdlib_mkdtemp.o \
-	stdlib_mkstemp.o \
-	stdlib_mktemp.o \
-	stdlib_modsi3.o \
-	stdlib_mulsi3.o \
-	stdlib_never_free.o \
-	stdlib_osliberror.o \
-	stdlib_oslibversion.o \
-	stdlib_priority.o \
-	stdlib_process_name.o \
-	stdlib_program_name.o \
-	stdlib_putenv.o \
-	stdlib_qsort.o \
-	stdlib_rand.o \
-	stdlib_rand_r.o \
-	stdlib_realloc.o \
-	stdlib_red_black.o \
-	stdlib_resetmemstats.o \
-	stdlib_semaphore.o \
-	stdlib_setenv.o \
-	stdlib_setjmp.o \
-	stdlib_set_errno.o \
-	stdlib_set_process_window.o \
-	stdlib_shell_escape.o \
-	stdlib_showerror.o \
-	stdlib_slab.o \
-	stdlib_slab_max_size.o \
-	stdlib_slab_purge_threshold.o \
-	stdlib_srand.o \
-	stdlib_stacksize.o \
-	stdlib_stack_usage.o \
-	stdlib_arg.o \
-	stdlib_stdio_window_spec.o \
-	stdlib_strtol.o \
-	stdlib_strtoll.o \
-	stdlib_strtoul.o \
-	stdlib_strtoull.o \
-	stdlib_swapstack.o \
-	stdlib_sysbase.o \
-	stdlib_system.o \
-	stdlib_termination_message.o \
-	stdlib_threshold.o \
-	stdlib_utilitybase.o \
-	stdlib_udivsi3.o \
-	stdlib_udivsi4.o \
-	stdlib_umodsi3.o \
-	stdlib_unsetenv.o \
-	strings_ffs.o \
-	strings_strcasecmp.o \
-	strings_strncasecmp.o \
-	string_bcmp.o \
-	string_bcopy.o \
-	string_bzero.o \
-	string_index.o \
-	string_memchr.o \
-	string_memcmp.o \
-	string_memcpy.o \
-	string_memmove.o \
-	string_memset.o \
-	string_rindex.o \
-	string_strcat.o \
-	string_strchr.o \
-	string_strcmp.o \
-	string_strcoll.o \
-	string_strcpy.o \
-	string_strcspn.o \
-	string_strdup.o \
-	string_strerror.o \
-	string_strerror_r.o \
-	string_strlcat.o \
-	string_strlcpy.o \
-	string_strlen.o \
-	string_strncat.o \
-	string_strncmp.o \
-	string_strncpy.o \
-	string_strpbrk.o \
-	string_strrchr.o \
-	string_strspn.o \
-	string_strstr.o \
-	string_strtok.o \
-	string_strtok_r.o \
-	string_strxfrm.o \
-	time_asctime.o \
-	time_asctime_r.o \
-	time_clock.o \
-	time_converttime.o \
-	time_convert_datestamp.o \
-	time_convert_time.o \
-	time_ctime.o \
-	time_ctime_r.o \
-	time_data.o \
-	time_days_per_date.o \
-	time_gettimeofday.o \
-	time_gmtime.o \
-	time_gmtime_r.o \
-	time_localtime.o \
-	time_localtime_r.o \
-	time_mktime.o \
-	time_numbertostring.o \
-	time_strftime.o \
-	time_time.o \
-	time_weekday.o \
-	uio_readv.o \
-	uio_writev.o \
-	ulimit_ulimit.o \
-	unistd_access.o \
-	unistd_chdir.o \
-	unistd_chdir_exit.o \
-	unistd_chown.o \
-	unistd_currentpathname.o \
-	unistd_dup.o \
-	unistd_dup2.o \
-	unistd_fchown.o \
-	unistd_fdatasync.o \
-	unistd_fdopen.o \
-	unistd_fileno.o \
-	unistd_fsync.o \
-	unistd_ftruncate.o \
-	unistd_getcwd.o \
-	unistd_getopt.o \
-	unistd_getpid.o \
-	unistd_init_exit.o \
-	unistd_isatty.o \
-	unistd_lchown.o \
-	unistd_link.o \
-	unistd_lockf.o \
-	unistd_readlink.o \
-	unistd_realpath.o \
-	unistd_sleep.o \
-	unistd_symlink.o \
-	unistd_sync_fd.o \
-	unistd_timer.o \
-	unistd_time_delay.o \
-	unistd_truncate.o \
-	unistd_unlink.o \
-	unistd_unlink_retries.o \
-	unistd_usleep.o \
-	utime_utime.o \
-	utsname_uname.o
 
-UNIX_LIB = \
+AMIGA_LIB := $(sort $(AMIGA_LIB_COMMON) $(AMIGA_LIB_OS3))
-	unix.lib_rev.o \
+C_LIB := $(sort $(C_LIB_COMMON) $(C_LIB_OS3))
-	dirent_closedir.o \
+UNIX_LIB := $(sort $(UNIX_LIB_COMMON) $(UNIX_LIB_OS3))
-	dirent_rewinddir.o \
-	dirent_opendir.o \
-	dirent_readdir.o \
-	fcntl_creat.o \
-	fcntl_fcntl.o \
-	fcntl_open.o \
-	fcntl_get_default_file.o \
-	getopt_getopt_long.o \
-	mount_convertinfo.o \
-	mount_statfs.o \
-	resource_getrlimit.o \
-	resource_setrlimit.o \
-	stat_chmod.o \
-	stat_fstat.o \
-	stat_lstat.o \
-	stat_lock.o \
-	stat_mkdir.o \
-	stat_rmdir.o \
-	stat_stat.o \
-	stdio_ctermid.o \
-	stdio_fdhookentry.o \
-	stdio_fflush.o \
-	stdio_fopen.o \
-	stdio_init_exit.o \
-	stdio_file_init.o \
-	stdio_locksemaphorename.o \
-	stdio_openiob.o \
-	stdio_popen.o \
-	stdio_record_locking.o \
-	stdio_remove.o \
-	stdio_rename.o \
-	stdlib_alloca.o \
-	stdlib_alloca_cleanup.o \
-	stdlib_alloca_trap.o \
-	stdlib_arg.o \
-	stdlib_expand_wildcard.o \
-	stdlib_expand_wildcard_check.o \
-	stdlib_getmemstats.o \
-	stdlib_main.o \
-	stdlib_main_stub.o \
-	stdlib_mkdtemp.o \
-	stdlib_mkstemp.o \
-	stdlib_mktemp.o \
-	stdlib_malloc.o \
-	stdlib_realloc.o \
-	stdlib_resetmemstats.o \
-	stdlib_system.o \
-	systeminfo_sysinfo.o \
-	termios_cfgetispeed.o \
-	termios_cfgetospeed.o \
-	termios_cfmakeraw.o \
-	termios_cfsetispeed.o \
-	termios_cfsetospeed.o \
-	termios_console_fdhookentry.o \
-	termios_tcdrain.o \
-	termios_tcflow.o \
-	termios_tcflush.o \
-	termios_tcgetattr.o \
-	termios_tcsendbreak.o \
-	termios_tcsetattr.o \
-	timeb_ftime.o \
-	uio_readv.o \
-	uio_writev.o \
-	unistd_access.o \
-	unistd_chdir.o \
-	unistd_chdir_exit.o \
-	unistd_chown.o \
-	unistd_common_pathconf.o \
-	unistd_def_path.o \
-	unistd_def_path_delimiter.o \
-	unistd_environ.o \
-	unistd_execl.o \
-	unistd_execle.o \
-	unistd_execlp.o \
-	unistd_execv.o \
-	unistd_execve.o \
-	unistd_execve_env_exit.o \
-	unistd_execve_env_init.o \
-	unistd_execve_exit.o \
-	unistd_execvp.o \
-	unistd_fpathconf.o \
-	unistd_getcwd.o \
-	unistd_lchown.o \
-	unistd_link.o \
-	unistd_lockf.o \
-	unistd_pathconf.o \
-	unistd_readlink.o \
-	unistd_realpath.o \
-	unistd_restorepathname.o \
-	unistd_setcurrentpath.o \
-	unistd_strip_double_slash.o \
-	unistd_symlink.o \
-	unistd_translatea2u.o \
-	unistd_translaterel.o \
-	unistd_translateu2a.o \
-	unistd_truncate.o \
-	unistd_ttyname.o \
-	unistd_ttyname_r.o \
-	unistd_unix_path_semantics.o \
-	unistd_unlink.o \
-	unistd_wildcard_expand.o \
-	utime_utime.o
-
-MATH_LIB = \
-	complex_carg.o \
-	complex_cargf.o \
-	complex_cargl.o \
-	complex_cimag.o \
-	complex_cimagf.o \
-	complex_cimagl.o \
-	complex_conj.o \
-	complex_conjf.o \
-	complex_conjl.o \
-	complex_creal.o \
-	complex_crealf.o \
-	complex_creall.o \
-	fenv_feclearexcept.o \
-	fenv_fegetenv.o \
-	fenv_fegetexceptflag.o \
-	fenv_fegetround.o \
-	fenv_feholdexcept.o \
-	fenv_feraiseexcept.o \
-	fenv_fesetenv.o \
-	fenv_fesetexceptflag.o \
-	fenv_fetestexcept.o \
-	fenv_fetestround.o \
-	fenv_feupdateenv.o \
-	math_acos.o \
-	math_acosf.o \
-	math_acosh.o \
-	math_acoshf.o \
-	math_asin.o \
-	math_asinf.o \
-	math_asinh.o \
-	math_asinhf.o \
-	math_atan.o \
-	math_atan2.o \
-	math_atan2f.o \
-	math_atanf.o \
-	math_atanh.o \
-	math_atanhf.o \
-	math_cbrt.o \
-	math_cbrtf.o \
-	math_ceil.o \
-	math_ceilf.o \
-	math_copysign.o \
-	math_copysignf.o \
-	math_cos.o \
-	math_cosf.o \
-	math_cosh.o \
-	math_coshf.o \
-	math_erf.o \
-	math_erfc.o \
-	math_erfcf.o \
-	math_erff.o \
-	math_exp.o \
-	math_exp2.o \
-	math_exp2f.o \
-	math_expf.o \
-	math_expm1.o \
-	math_expm1f.o \
-	math_fabs.o \
-	math_fabsf.o \
-	math_fdim.o \
-	math_fdimf.o \
-	math_floor.o \
-	math_floorf.o \
-	math_fma.o \
-	math_fmaf.o \
-	math_fmax.o \
-	math_fmaxf.o \
-	math_fmin.o \
-	math_fminf.o \
-	math_fmod.o \
-	math_fmodf.o \
-	math_fpclassify.o \
-	math_frexp.o \
-	math_frexpf.o \
-	math_huge_val.o \
-	math_huge_valf.o \
-	math_hypot.o \
-	math_hypotf.o \
-	math_ilogb.o \
-	math_ilogbf.o \
-	math_inf.o \
-	math_inff.o \
-	math_init_exit.o \
-	math_isfinite.o \
-	math_isunordered.o \
-	math_kernel_cosf.o \
-	math_kernel_sinf.o \
-	math_kernel_tanf.o \
-	math_ldexp.o \
-	math_ldexpf.o \
-	math_lgamma.o \
-	math_lgammaf.o \
-	math_llrint.o \
-	math_log.o \
-	math_log10.o \
-	math_log10f.o \
-	math_log1p.o \
-	math_log1pf.o \
-	math_log2.o \
-	math_log2f.o \
-	math_logb.o \
-	math_logbf.o \
-	math_logf.o \
-	math_lrint.o \
-	math_lrintf.o \
-	math_lround.o \
-	math_lroundf.o \
-	math_modf.o \
-	math_modff.o \
-	math_nan.o \
-	math_nanf.o \
-	math_nearbyint.o \
-	math_nearbyintf.o \
-	math_nextafter.o \
-	math_nextafterf.o \
-	math_pow.o \
-	math_powf.o \
-	math_remainder.o \
-	math_remainderf.o \
-	math_remquo.o \
-	math_remquof.o \
-	math_rem_pio2f.o \
-	math_rint.o \
-	math_rintf.o \
-	math_round.o \
-	math_roundf.o \
-	math_scalbn.o \
-	math_scalbnf.o \
-	math_signbit.o \
-	math_sin.o \
-	math_sinf.o \
-	math_sinh.o \
-	math_sinhf.o \
-	math_sqrt.o \
-	math_sqrtf.o \
-	math_tan.o \
-	math_tanf.o \
-	math_tanh.o \
-	math_tanhf.o \
-	math_tgamma.o \
-	math_tgammaf.o \
-	math_trunc.o \
-	math_truncf.o \
-	stdio_asprintf.o \
-	stdio_flush.o \
-	stdio_flush_all_files.o \
-	stdio_fprintf.o \
-	stdio_fscanf.o \
-	stdio_printf.o \
-	stdio_scanf.o \
-	stdio_snprintf.o \
-	stdio_sprintf.o \
-	stdio_sscanf.o \
-	stdio_vasprintf.o \
-	stdio_vfprintf.o \
-	stdio_vfscanf.o \
-	stdio_vsscanf.o \
-	stdio_vscanf.o \
-	stdio_vprintf.o \
-	stdio_vsnprintf.o \
-	stdio_vsprintf.o \
-	stdlib_atof.o \
-	stdlib_strtod.o \
-	stdlib_strtof.o \
-	time_difftime.o
-
-MATH_LIB_881 = \
-	m881.lib_rev.o \
-	$(MATH_LIB)
-
-MATH_LIB_IEEE = \
-	m.lib_rev.o \
-	$(MATH_LIB) \
-	math_adddf3.o \
-	math_addsf3.o \
-	math_divdf3.o \
-	math_divsf3.o \
-	math_eqdf2.o \
-	math_eqsf2.o \
-	math_extendsfdf2.o \
-	math_fixdfsi.o \
-	math_fixsfsi.o \
-	math_fixunsdfsi.o \
-	math_fixunssfsi.o \
-	math_floatsidf.o \
-	math_floatsisf.o \
-	math_gedf2.o \
-	math_gesf2.o \
-	math_gtdf2.o \
-	math_gtsf2.o \
-	math_ledf2.o \
-	math_lesf2.o \
-	math_ltdf2.o \
-	math_ltsf2.o \
-	math_muldf3.o \
-	math_mulsf3.o \
-	math_nedf2.o \
-	math_negdf2.o \
-	math_negsf2.o \
-	math_nesf2.o \
-	math_subdf3.o \
-	math_subsf3.o \
-	math_truncdfsf2.o
-
-NET_LIB = \
-	net.lib_rev.o \
-	socket_accept.o \
-	socket_bind.o \
-	socket_check_daemon.o \
-	socket_connect.o \
-	socket_gethostbyaddr.o \
-	socket_gethostbyname.o \
-	socket_gethostid.o \
-	socket_gethostname.o \
-	socket_getnetbyaddr.o \
-	socket_getnetbyname.o \
-	socket_getpeername.o \
-	socket_getprotobyname.o \
-	socket_getprotobynumber.o \
-	socket_getservbyname.o \
-	socket_getservbyport.o \
-	socket_getsockname.o \
-	socket_getsockopt.o \
-	socket_get_descriptor.o \
-	socket_inet_addr.o \
-	socket_inet_aton.o \
-	socket_inet_lnaof.o \
-	socket_inet_makeaddr.o \
-	socket_inet_netof.o \
-	socket_inet_network.o \
-	socket_inet_ntoa.o \
-	socket_init_exit.o \
-	socket_ioctl.o \
-	socket_isdaemon.o \
-	socket_listen.o \
-	socket_obtain_daemon.o \
-	socket_recv.o \
-	socket_recvfrom.o \
-	socket_recvmsg.o \
-	socket_select_signal.o \
-	socket_select.o \
-	socket_wait_select.o \
-	socket_send.o \
-	socket_sendmsg.o \
-	socket_sendto.o \
-	socket_setsockopt.o \
-	socket_shutdown.o \
-	socket_socket.o \
-	socket_hook_entry.o \
-	socket_hstrerror.o \
-	socket_get_h_errno.o \
-	socket_set_h_errno.o \
-	stat_umask.o \
-	systeminfo_sysinfo.o \
-	usergroup_crypt.o \
-	usergroup_data.o \
-	usergroup_endgrent.o \
-	usergroup_endpwent.o \
-	usergroup_getegid.o \
-	usergroup_geteuid.o \
-	usergroup_getgid.o \
-	usergroup_getgrent.o \
-	usergroup_getgrgid.o \
-	usergroup_getgrnam.o \
-	usergroup_getgroups.o \
-	usergroup_getpass.o \
-	usergroup_getpwent.o \
-	usergroup_getpwnam.o \
-	usergroup_getpwuid.o \
-	usergroup_getuid.o \
-	usergroup_initgroups.o \
-	usergroup_init_exit.o \
-	usergroup_rootmode.o \
-	usergroup_setegid.o \
-	usergroup_seteuid.o \
-	usergroup_setgid.o \
-	usergroup_setgrent.o \
-	usergroup_setgroups.o \
-	usergroup_setpwent.o \
-	usergroup_setregid.o \
-	usergroup_setreuid.o \
-	usergroup_setsid.o \
-	usergroup_setuid.o \
-	utsname_uname.o
-
-DEBUG_LIB = \
-	debug.lib_rev.o \
-	debug.o \
-	debug_cmpstrexec.o \
-	debug_kcmpstr.o \
-	debug_kdofmt.o \
-	debug_kgetc.o \
-	debug_kgetch1.o \
-	debug_kgetch2.o \
-	debug_kgetchar1.o \
-	debug_kgetchar2.o \
-	debug_kgetnum1.o \
-	debug_kgetnum2.o \
-	debug_kmaygetch.o \
-	debug_kmaygetchar.o \
-	debug_kprintf1.o \
-	debug_kprintf2.o \
-	debug_kputc.o \
-	debug_kputch1.o \
-	debug_kputch2.o \
-	debug_kputchar1.o \
-	debug_kputchar2.o \
-	debug_kputfmt.o \
-	debug_kputs1.o \
-	debug_kputs2.o \
-	debug_kputstr1.o \
-	debug_kputstr2.o \
-	debug_kvprintf1.o \
-	debug_kvprintf2.o \
-	debug_level.o
-
-AMIGA_LIB = \
-	amiga.lib_rev.o \
-	amiga_acrypt.o \
-	amiga_addtof.o \
-	amiga_argarraydone.o \
-	amiga_argarrayinit.o \
-	amiga_argint.o \
-	amiga_argstring.o \
-	amiga_beginio.o \
-	amiga_callhook.o \
-	amiga_callhooka.o \
-	amiga_coercemethod.o \
-	amiga_createextio.o \
-	amiga_createport.o \
-	amiga_createstdio.o \
-	amiga_createtask.o \
-	amiga_deleteextio.o \
-	amiga_deleteport.o \
-	amiga_deletestdio.o \
-	amiga_deletetask.o \
-	amiga_domethod.o \
-	amiga_dosupermethod.o \
-	amiga_dotimer.o \
-	amiga_fastrand.o \
-	amiga_freeievents.o \
-	amiga_hookentry.o \
-	amiga_hotkey.o \
-	amiga_invertstring.o \
-	amiga_newlist.o \
-	amiga_rangerand.o \
-	amiga_remtof.o \
-	amiga_rexxvars.o \
-	amiga_setsuperattrs.o \
-	amiga_timedelay.o \
-	amiga_waitbeam.o
 
 MEMDEBUG_LIB = \
 	stdio_vasprintf_debug.o \
@@ -961,8 +163,8 @@ MEMDEBUG_LIB = \
 ##############################################################################
 
 LIBS_68K := $(LIBC_OBJS)/libc.a $(LIBUNIX_OBJS)/libunix.a \
-            $(LIBNET_OBJS)/libnet.a $(LIBDEBUG_OBJS)/libdebug.a $(LIBAMIGA_OBJS)/libamiga.a \
+            $(LIBNET_OBJS)/libnet.a $(LIBDEBUG_OBJS)/libdebug.a \
-            $(LIBM_OBJS)/libm.a
+	    $(LIBAMIGA_OBJS)/libamiga.a $(LIBM_OBJS)/libm.a
 LIBS_020 := $(LIBM881_OBJS)/libm881.a $(LIBS_68K)
 
 ##############################################################################

library/GNUmakefile.os4

@@ -1,7 +1,7 @@
 #
 # $Id: GNUmakefile.os4,v 1.116 2008-11-06 14:44:07 obarthel Exp $
 #
-# :ts=8
+# vim:ts=8 ft=make:
 #
 # -*- mode: makefile; -*-
 
@@ -95,32 +95,45 @@ include libdebug.gmk
 include libamiga.gmk
 include libprofile.gmk
 
-all-targets: \
+##############################################################################
-	lib/crt0.o \
+
-	lib/small-data/crt0.o \
+# General build rules for all object files and the individual libraries
-	lib/soft-float/crt0.o \
+
-	lib/baserel/crt0.o \
+define generic_rule
-	lib/crtbegin.o \
+
-	lib/soft-float/crtbegin.o \
+LIBS += lib/$(1)crt0.o \
-	lib/small-data/crtbegin.o \
+	lib/$(1)crtbegin.o \
-	lib/baserel/crtbegin.o \
+	lib/$(1)crtend.o \
-	lib/crtend.o \
+	lib.threadsafe/$(1)crt0.o \
-	lib/soft-float/crtend.o \
+	lib.threadsafe/$(1)crtbegin.o \
-	lib/small-data/crtend.o \
+	lib.threadsafe/$(1)crtend.o
-	lib/baserel/crtend.o \
+
-	lib.threadsafe/crt0.o \
+lib/$(1)%.o : AFLAGS += $(2)
-	lib.threadsafe/small-data/crt0.o \
+lib/$(1)%.o : %.S
-	lib.threadsafe/soft-float/crt0.o \
+	@$$(ASSEMBLE)
-	lib.threadsafe/baserel/crt0.o \
+
-	lib.threadsafe/crtbegin.o \
+lib/$(1)%.o : CFLAGS += $(2)
-	lib.threadsafe/soft-float/crtbegin.o \
+lib/$(1)%.o : %.c
-	lib.threadsafe/small-data/crtbegin.o \
+	@$$(COMPILE)
-	lib.threadsafe/baserel/crtbegin.o \
+
-	lib.threadsafe/crtend.o \
+lib.threadsafe/$(1)%.o : AFLAGS += $(THREADSAFE) $(2)
-	lib.threadsafe/soft-float/crtend.o \
+lib.threadsafe/$(1)%.o : %.S
-	lib.threadsafe/small-data/crtend.o \
+	@$$(ASSEMBLE)
-	lib.threadsafe/baserel/crtend.o \
+
-	$(LIBS)
+lib.threadsafe/$(1)%.o : CFLAGS += $(THREADSAFE) $(2)
+lib.threadsafe/$(1)%.o : %.c
+	@$$(COMPILE)
+
+endef
+
+$(eval $(call generic_rule,,$(LARGEDATA)))
+$(eval $(call generic_rule,small-data/,$(SMALLDATA)))
+$(eval $(call generic_rule,soft-float/,$(SOFTFLOAT)))
+$(eval $(call generic_rule,baserel/,$(BASEREL)))
+
+##############################################################################
+
+all-targets: $(LIBS)
 
 ##############################################################################
 
@@ -158,66 +171,6 @@ cvs-tag:
 
 ##############################################################################
 
-# General build rules for all object files and the individual libraries
-
-lib/%.o : AFLAGS += $(LARGEDATA)
-lib/%.o : %.S
-	@$(ASSEMBLE)
-
-lib/%.o : %.c
-	@$(COMPILE)
-
-lib/small-data/%.o : AFLAGS += $(SMALLDATA)
-lib/small-data/%.o : %.S
-	@$(ASSEMBLE)
-
-lib/small-data/%.o : %.c
-	@$(COMPILE)
-
-lib/soft-float/%.o : AFLAGS += $(SOFTFLOAT)
-lib/soft-float/%.o : %.S
-	@$(ASSEMBLE)
-
-lib/soft-float/%.o : %.c
-	@$(COMPILE)
-
-lib/baserel/%.o : AFLAGS += $(BASEREL)
-lib/baserel/%.o : %.S
-	@$(ASSEMBLE)
-
-lib/baserel/%.o : %.c
-	@$(COMPILE)
-
-lib.threadsafe/%.o : AFLAGS += $(LARGEDATA) $(THREADSAFE)
-lib.threadsafe/%.o : %.S
-	@$(ASSEMBLE)
-
-lib.threadsafe/%.o : %.c
-	@$(COMPILE)
-
-lib.threadsafe/small-data/%.o : AFLAGS += $(SMALLDATA) $(THREADSAFE)
-lib.threadsafe/small-data/%.o : %.S
-	@$(ASSEMBLE)
-
-lib.threadsafe/small-data/%.o : %.c
-	@$(COMPILE)
-
-lib.threadsafe/soft-float/%.o : AFLAGS += $(SOFTFLOAT) $(THREADSAFE)
-lib.threadsafe/soft-float/%.o : %.S
-	@$(ASSEMBLE)
-
-lib.threadsafe/soft-float/%.o : %.c
-	@$(COMPILE)
-
-lib.threadsafe/baserel/%.o : AFLAGS += $(BASEREL) $(THREADSAFE)
-lib.threadsafe/baserel/%.o : %.S
-	@$(ASSEMBLE)
-
-lib.threadsafe/baserel/%.o : %.c
-	@$(COMPILE)
-
-##############################################################################
-
 define COMPILE
 -$(MAKEDIR) $(@D)
 echo "Compiling $< [$(@D)]"

library/libamiga.gmk

@@ -1,127 +1,44 @@
 #
 # $Id: libamiga.gmk,v 1.1 2006-09-17 17:37:27 obarthel Exp $
 #
-# :ts=8
+# vim:ts=8 ft=make:
 #
 # -*- mode: makefile; -*-
 
 ##############################################################################
 
-LIBS += \
+include libamiga.obj.gmk
-	lib/libamiga.a \
+AMIGA_LIB = $(sort $(AMIGA_LIB_COMMON) $(AMIGA_LIB_OS4))
-	lib/soft-float/libamiga.a \
-	lib/small-data/libamiga.a \
-	lib/baserel/libamiga.a \
-	lib.threadsafe/libamiga.a \
-	lib.threadsafe/soft-float/libamiga.a \
-	lib.threadsafe/small-data/libamiga.a \
-	lib.threadsafe/baserel/libamiga.a
 
 ##############################################################################
 
-AMIGA_LIB = \
+define libamiga_rule
-	amiga.lib_rev.o \
-	amiga_acrypt.o \
-	amiga_addtof.o \
-	amiga_argarraydone.o \
-	amiga_argarrayinit.o \
-	amiga_argint.o \
-	amiga_argstring.o \
-	amiga_beginio.o \
-	amiga_callhooka.o \
-	amiga_coercemethod.o \
-	amiga_createextio.o \
-	amiga_createport.o \
-	amiga_createstdio.o \
-	amiga_createtask.o \
-	amiga_deleteextio.o \
-	amiga_deleteport.o \
-	amiga_deletestdio.o \
-	amiga_deletetask.o \
-	amiga_domethod.o \
-	amiga_dosupermethod.o \
-	amiga_dotimer.o \
-	amiga_fastrand.o \
-	amiga_freeievents.o \
-	amiga_hotkey.o \
-	amiga_invertstring.o \
-	amiga_newlist.o \
-	amiga_rangerand.o \
-	amiga_remtof.o \
-	amiga_rexxvars.o \
-	amiga_setsuperattrs.o \
-	amiga_timedelay.o \
-	amiga_waitbeam.o
 
-##############################################################################
+LIBS += lib/$(1).a lib.threadsafe/$(1).a
 
 # Dependencies to rebuild if the library version changes
+obj/$(1)/amiga.lib_rev.o : amiga.lib_rev.c amiga.lib_rev.h
+obj.threadsafe/$(1)/amiga.lib_rev.o : amiga.lib_rev.c amiga.lib_rev.h
 
-obj/libamiga/amiga.lib_rev.o : amiga.lib_rev.c amiga.lib_rev.h
+obj/$(1)/%.o : CFLAGS += $(2)
-obj/soft-float/libamiga/amiga.lib_rev.o : amiga.lib_rev.c amiga.lib_rev.h
+obj/$(1)/%.o : %.c
-obj/small-data/libamiga/amiga.lib_rev.o : amiga.lib_rev.c amiga.lib_rev.h
+	@$$(COMPILE)
-obj/baserel/libamiga/amiga.lib_rev.o : amiga.lib_rev.c amiga.lib_rev.h
+
-obj.threadsafe/libamiga/amiga.lib_rev.o : amiga.lib_rev.c amiga.lib_rev.h
+obj.threadsafe/$(1)/%.o : CFLAGS += $(THREADSAFE) $(2)
-obj.threadsafe/soft-float/libamiga/amiga.lib_rev.o : amiga.lib_rev.c amiga.lib_rev.h
+obj.threadsafe/$(1)/%.o : %.c
-obj.threadsafe/small-data/libamiga/amiga.lib_rev.o : amiga.lib_rev.c amiga.lib_rev.h
+	@$$(COMPILE)
-obj.threadsafe/baserel/libamiga/amiga.lib_rev.o : amiga.lib_rev.c amiga.lib_rev.h
+
+lib/$(1).a : $$(addprefix obj/$(1)/,$$(AMIGA_LIB))
+	@$$(MAKELIB)
+
+lib.threadsafe/$(1).a : $$(addprefix obj.threadsafe/$(1)/,$$(AMIGA_LIB))
+	@$$(MAKELIB)
+
+endef
 
 ##############################################################################
 
-obj/libamiga/%.o : CFLAGS += $(LARGEDATA)
+$(eval $(call libamiga_rule,libamiga,$(LARGEDATA)))
-obj/libamiga/%.o : %.c
+$(eval $(call libamiga_rule,soft-float/libamiga,$(SOFTFLOAT)))
-	@$(COMPILE)
+$(eval $(call libamiga_rule,small-data/libamiga,$(SMALLDATA)))
-
+$(eval $(call libamiga_rule,baserel/libamiga,$(BASEREL)))
-obj/soft-float/libamiga/%.o : CFLAGS += $(SOFTFLOAT)
-obj/soft-float/libamiga/%.o : %.c
-	@$(COMPILE)
-
-obj/small-data/libamiga/%.o : CFLAGS += $(SMALLDATA)
-obj/small-data/libamiga/%.o : %.c
-	@$(COMPILE)
-
-obj/baserel/libamiga/%.o : CFLAGS += $(BASEREL)
-obj/baserel/libamiga/%.o : %.c
-	@$(COMPILE)
-
-obj.threadsafe/libamiga/%.o : CFLAGS += $(THREADSAFE) $(LARGEDATA)
-obj.threadsafe/libamiga/%.o : %.c
-	@$(COMPILE)
-
-obj.threadsafe/soft-float/libamiga/%.o : CFLAGS += $(THREADSAFE) $(SOFTFLOAT)
-obj.threadsafe/soft-float/libamiga/%.o : %.c
-	@$(COMPILE)
-
-obj.threadsafe/small-data/libamiga/%.o : CFLAGS += $(THREADSAFE) $(SMALLDATA)
-obj.threadsafe/small-data/libamiga/%.o : %.c
-	@$(COMPILE)
-
-obj.threadsafe/baserel/libamiga/%.o : CFLAGS += $(THREADSAFE) $(BASEREL)
-obj.threadsafe/baserel/libamiga/%.o : %.c
-	@$(COMPILE)
-
-##############################################################################
-
-lib/libamiga.a : $(addprefix obj/libamiga/,$(AMIGA_LIB))
-	@$(MAKELIB)
-
-lib/soft-float/libamiga.a : $(addprefix obj/soft-float/libamiga/,$(AMIGA_LIB))
-	@$(MAKELIB)
-
-lib/small-data/libamiga.a : $(addprefix obj/small-data/libamiga/,$(AMIGA_LIB))
-	@$(MAKELIB)
-
-lib/baserel/libamiga.a : $(addprefix obj/baserel/libamiga/,$(AMIGA_LIB))
-	@$(MAKELIB)
-
-lib.threadsafe/libamiga.a : $(addprefix obj.threadsafe/libamiga/,$(AMIGA_LIB))
-	@$(MAKELIB)
-
-lib.threadsafe/soft-float/libamiga.a : $(addprefix obj.threadsafe/soft-float/libamiga/,$(AMIGA_LIB))
-	@$(MAKELIB)
-
-lib.threadsafe/small-data/libamiga.a : $(addprefix obj.threadsafe/small-data/libamiga/,$(AMIGA_LIB))
-	@$(MAKELIB)
-
-lib.threadsafe/baserel/libamiga.a : $(addprefix obj.threadsafe/baserel/libamiga/,$(AMIGA_LIB))
-	@$(MAKELIB)

library/libamiga.obj.gmk

@@ -0,0 +1,43 @@
+# vim:ts=8 ft=make:
+#
+# -*- mode: makefile; -*-
+
+AMIGA_LIB_COMMON := \
+	amiga.lib_rev.o \
+	amiga_acrypt.o \
+	amiga_addtof.o \
+	amiga_argarraydone.o \
+	amiga_argarrayinit.o \
+	amiga_argint.o \
+	amiga_argstring.o \
+	amiga_beginio.o \
+	amiga_callhooka.o \
+	amiga_coercemethod.o \
+	amiga_createextio.o \
+	amiga_createport.o \
+	amiga_createstdio.o \
+	amiga_createtask.o \
+	amiga_deleteextio.o \
+	amiga_deleteport.o \
+	amiga_deletestdio.o \
+	amiga_deletetask.o \
+	amiga_domethod.o \
+	amiga_dosupermethod.o \
+	amiga_dotimer.o \
+	amiga_fastrand.o \
+	amiga_freeievents.o \
+	amiga_hotkey.o \
+	amiga_invertstring.o \
+	amiga_newlist.o \
+	amiga_rangerand.o \
+	amiga_remtof.o \
+	amiga_rexxvars.o \
+	amiga_setsuperattrs.o \
+	amiga_timedelay.o \
+	amiga_waitbeam.o
+
+AMIGA_LIB_OS3 := \
+	amiga_callhook.o \
+	amiga_hookentry.o
+
+AMIGA_LIB_OS4 :=

library/libc.gmk

@@ -1,448 +1,44 @@
 #
 # $Id: libc.gmk,v 1.9 2010-10-20 13:50:17 obarthel Exp $
 #
-# :ts=8
+# vim:ts=8 ft=make:
 #
 # -*- mode: makefile; -*-
 
 ##############################################################################
 
-LIBS += \
+include libc.obj.gmk
-	lib/libc.a \
+C_LIB := $(sort $(C_LIB_COMMON) $(C_LIB_OS4))
-	lib/soft-float/libc.a \
-	lib/small-data/libc.a \
-	lib/baserel/libc.a \
-	lib.threadsafe/libc.a \
-	lib.threadsafe/soft-float/libc.a \
-	lib.threadsafe/small-data/libc.a \
-	lib.threadsafe/baserel/libc.a
 
 ##############################################################################
 
-C_LIB := \
+define libc_rule
-	c.lib_rev.o \
-	ctype_isalnum.o \
-	ctype_isalpha.o \
-	ctype_isascii.o \
-	ctype_isblank.o \
-	ctype_iscntrl.o \
-	ctype_isdigit.o \
-	ctype_isgraph.o \
-	ctype_islower.o \
-	ctype_isprint.o \
-	ctype_ispunct.o \
-	ctype_isspace.o \
-	ctype_isupper.o \
-	ctype_isxdigit.o \
-	ctype_table.o \
-	ctype_tolower.o \
-	ctype_toupper.o \
-	dirent_closedir.o \
-	dirent_opendir.o \
-	dirent_readdir.o \
-	dirent_rewinddir.o \
-	errno_data.o \
-	fcntl_close.o \
-	fcntl_creat.o \
-	fcntl_fcntl.o \
-	fcntl_get_default_file.o \
-	fcntl_lock.o \
-	fcntl_lseek.o \
-	fcntl_open.o \
-	fcntl_read.o \
-	fcntl_write.o \
-	ftw_ftw.o \
-	ftw_nftw.o \
-	inttypes_imaxdiv.o \
-	inttypes_imaxabs.o \
-	inttypes_strtoimax.o \
-	inttypes_strtoumax.o \
-	libgen_basename.o \
-	libgen_dirname.o \
-	locale_init_exit.o \
-	locale_localeconv.o \
-	locale_open_locale.o \
-	locale_setlocale.o \
-	mount_convertinfo.o \
-	mount_fstatfs.o \
-	mount_statfs.o \
-	profile_profil.o \
-	signal_checkabort.o \
-	signal_data.o \
-	signal_kill.o \
-	signal_mask.o \
-	signal_raise.o \
-	signal_sigaddset.o \
-	signal_sigblock.o \
-	signal_sigemptyset.o \
-	signal_sigmask.o \
-	signal_signal.o \
-	signal_sigprocmask.o \
-	signal_sigsetmask.o \
-	stat_chmod.o \
-	stat_convertfileinfo.o \
-	stat_fchmod.o \
-	stat_fstat.o \
-	stat_lstat.o \
-	stat_lock.o \
-	stat_mkdir.o \
-	stat_rmdir.o \
-	stat_stat.o \
-	stat_umask.o \
-	stdio_asprintf.o \
-	stdio_change_fd_action.o \
-	stdio_change_fd_user_data.o \
-	stdio_clearerr.o \
-	stdio_dropiobreadbuffer.o \
-	stdio_duplicate_fd.o \
-	stdio_examine_fh.o \
-	stdio_fclose.o \
-	stdio_fdhookentry.o \
-	stdio_feof.o \
-	stdio_ferror.o \
-	stdio_fflush.o \
-	stdio_fgetc.o \
-	stdio_fgetpos.o \
-	stdio_fgets.o \
-	stdio_filliobreadbuffer.o \
-	stdio_findvacantfdentry.o \
-	stdio_findvacantiobentry.o \
-	stdio_flockfile.o \
-	stdio_flush.o \
-	stdio_flush_all_files.o \
-	stdio_flushiobwritebuffer.o \
-	stdio_fopen.o \
-	stdio_fprintf.o \
-	stdio_fputc.o \
-	stdio_fputs.o \
-	stdio_fread.o \
-	stdio_freopen.o \
-	stdio_fscanf.o \
-	stdio_fseek.o \
-	stdio_fseeko.o \
-	stdio_fsetpos.o \
-	stdio_ftell.o \
-	stdio_ftello.o \
-	stdio_ftrylockfile.o \
-	stdio_funlockfile.o \
-	stdio_fwrite.o \
-	stdio_getc.o \
-	stdio_getc_unlocked.o \
-	stdio_getchar.o \
-	stdio_getchar_unlocked.o \
-	stdio_gets.o \
-	stdio_get_fd.o \
-	stdio_get_file_descriptor.o \
-	stdio_growfdtable.o \
-	stdio_growiobtable.o \
-	stdio_grow_file.o \
-	stdio_initializefd.o \
-	stdio_initializeiob.o \
-	stdio_init_exit.o \
-	stdio_file_init.o \
-	stdio_iobhookentry.o \
-	stdio_lock.o \
-	stdio_locksemaphorename.o \
-	stdio_nostdio.o \
-	stdio_openiob.o \
-	stdio_parent_of_fh.o \
-	stdio_perror.o \
-	stdio_popen.o \
-	stdio_printf.o \
-	stdio_putc.o \
-	stdio_putc_unlocked.o \
-	stdio_putchar.o \
-	stdio_putchar_unlocked.o \
-	stdio_puts.o \
-	stdio_remove.o \
-	stdio_remove_fd_alias.o \
-	stdio_rename.o \
-	stdio_resolve_fd_file.o \
-	stdio_rewind.o \
-	stdio_scanf.o \
-	stdio_setbuf.o \
-	stdio_setvbuf.o \
-	stdio_snprintf.o \
-	stdio_sprintf.o \
-	stdio_sscanf.o \
-	stdio_sscanf_hook_entry.o \
-	stdio_tmpfile.o \
-	stdio_tmpnam.o \
-	stdio_translateioerror.o \
-	stdio_ungetc.o \
-	stdio_unlockfile.o \
-	stdio_vasprintf.o \
-	stdio_vasprintf_hook_entry.o \
-	stdio_vfprintf.o \
-	stdio_vfscanf.o \
-	stdio_vsscanf.o \
-	stdio_vscanf.o \
-	stdio_vprintf.o \
-	stdio_vsnprintf.o \
-	stdio_vsnprintf_hook_entry.o \
-	stdio_vsprintf.o \
-	stdio_vsprintf_hook_entry.o \
-	stdlib_abort.o \
-	stdlib_abs.o \
-	stdlib_alloca.o \
-	stdlib_alloca_cleanup.o \
-	stdlib_alloca_trap.o \
-	stdlib_assertion_failure.o \
-	stdlib_atexit.o \
-	stdlib_atoi.o \
-	stdlib_atol.o \
-	stdlib_atoll.o \
-	stdlib_bsearch.o \
-	stdlib_calloc.o \
-	stdlib_checkdetach.o \
-	stdlib_constructor.o \
-	stdlib_constructor_begin.o \
-	stdlib_default_pool_size.o \
-	stdlib_default_puddle_size.o \
-	stdlib_destructor.o \
-	stdlib_detach.o \
-	stdlib_disablerequesters.o \
-	stdlib_div.o \
-	stdlib_divsi3.o \
-	stdlib_divsi4.o \
-	stdlib_dlclose.o \
-	stdlib_dlerror.o \
-	stdlib_dlopen.o \
-	stdlib_dlsym.o \
-	stdlib_dosbase.o \
-	stdlib_exit.o \
-	stdlib_free.o \
-	stdlib_decay_unused_slabs.o \
-	stdlib_free_unused_slabs.o \
-	stdlib_getdefstacksize.o \
-	stdlib_getenv.o \
-	stdlib_getmemstats.o \
-	stdlib_getsp.o \
-	stdlib_get_errno.o \
-	stdlib_get_slab_usage.o \
-	stdlib_get_slab_allocations.o \
-	stdlib_get_slab_stats.o \
-	stdlib_isresident.o \
-	stdlib_labs.o \
-	stdlib_llabs.o \
-	stdlib_ldiv.o \
-	stdlib_lldiv.o \
-	stdlib_lib_main.o \
-	stdlib_lib_startup.o \
-	stdlib_machine_test.o \
-	stdlib_main.o \
-	stdlib_main_stub.o \
-	stdlib_malloc.o \
-	stdlib_math.o \
-	stdlib_mkdtemp.o \
-	stdlib_mkstemp.o \
-	stdlib_mktemp.o \
-	stdlib_modsi3.o \
-	stdlib_mulsi3.o \
-	stdlib_never_free.o \
-	stdlib_osliberror.o \
-	stdlib_oslibversion.o \
-	stdlib_priority.o \
-	stdlib_process_name.o \
-	stdlib_program_name.o \
-	stdlib_putenv.o \
-	stdlib_qsort.o \
-	stdlib_rand.o \
-	stdlib_rand_r.o \
-	stdlib_realloc.o \
-	stdlib_red_black.o \
-	stdlib_resetmemstats.o \
-	stdlib_semaphore.o \
-	stdlib_setenv.o \
-	stdlib_setjmp.o \
-	stdlib_set_errno.o \
-	stdlib_set_process_window.o \
-	stdlib_shared_objs.o \
-	stdlib_shell_escape.o \
-	stdlib_showerror.o \
-	stdlib_slab.o \
-	stdlib_slab_max_size.o \
-	stdlib_slab_purge_threshold.o \
-	stdlib_srand.o \
-	stdlib_stacksize.o \
-	stdlib_stack_usage.o \
-	stdlib_arg.o \
-	stdlib_stdio_window_spec.o \
-	stdlib_strtol.o \
-	stdlib_strtoll.o \
-	stdlib_strtoul.o \
-	stdlib_strtoull.o \
-	stdlib_swapstack.o \
-	stdlib_sysbase.o \
-	stdlib_system.o \
-	stdlib_termination_message.o \
-	stdlib_threshold.o \
-	stdlib_utilitybase.o \
-	stdlib_udivsi3.o \
-	stdlib_udivsi4.o \
-	stdlib_umodsi3.o \
-	stdlib_unsetenv.o \
-	strings_ffs.o \
-	strings_strcasecmp.o \
-	strings_strncasecmp.o \
-	string_bcmp.o \
-	string_bcopy.o \
-	string_bzero.o \
-	string_index.o \
-	string_memchr.o \
-	string_memcmp.o \
-	string_memcpy.o \
-	string_memmove.o \
-	string_memset.o \
-	string_rindex.o \
-	string_strcat.o \
-	string_strchr.o \
-	string_strcmp.o \
-	string_strcoll.o \
-	string_strcpy.o \
-	string_strcspn.o \
-	string_strdup.o \
-	string_strerror.o \
-	string_strerror_r.o \
-	string_strlcat.o \
-	string_strlcpy.o \
-	string_strlen.o \
-	string_strncat.o \
-	string_strncmp.o \
-	string_strncpy.o \
-	string_strpbrk.o \
-	string_strrchr.o \
-	string_strspn.o \
-	string_strstr.o \
-	string_strtok.o \
-	string_strtok_r.o \
-	string_strxfrm.o \
-	time_asctime.o \
-	time_asctime_r.o \
-	time_clock.o \
-	time_converttime.o \
-	time_convert_datestamp.o \
-	time_convert_time.o \
-	time_ctime.o \
-	time_ctime_r.o \
-	time_data.o \
-	time_days_per_date.o \
-	time_gettimeofday.o \
-	time_gmtime.o \
-	time_gmtime_r.o \
-	time_localtime.o \
-	time_localtime_r.o \
-	time_mktime.o \
-	time_numbertostring.o \
-	time_strftime.o \
-	time_time.o \
-	time_weekday.o \
-	uio_readv.o \
-	uio_writev.o \
-	ulimit_ulimit.o \
-	unistd_access.o \
-	unistd_chdir.o \
-	unistd_chdir_exit.o \
-	unistd_chown.o \
-	unistd_currentpathname.o \
-	unistd_dup.o \
-	unistd_dup2.o \
-	unistd_fchown.o \
-	unistd_fdatasync.o \
-	unistd_fdopen.o \
-	unistd_fileno.o \
-	unistd_fsync.o \
-	unistd_ftruncate.o \
-	unistd_getcwd.o \
-	unistd_getopt.o \
-	unistd_getpid.o \
-	unistd_init_exit.o \
-	unistd_isatty.o \
-	unistd_lchown.o \
-	unistd_link.o \
-	unistd_lockf.o \
-	unistd_readlink.o \
-	unistd_realpath.o \
-	unistd_sleep.o \
-	unistd_symlink.o \
-	unistd_sync_fd.o \
-	unistd_timer.o \
-	unistd_time_delay.o \
-	unistd_truncate.o \
-	unistd_unlink.o \
-	unistd_usleep.o \
-	utime_utime.o \
-	utsname_uname.o
 
-##############################################################################
+LIBS += lib/$(1).a lib.threadsafe/$(1).a
 
 # Dependencies to rebuild if the library version changes
+obj/$(1)/c.lib_rev.o : c.lib_rev.c c.lib_rev.h
+obj.threadsafe/$(1)/c.lib_rev.o : c.lib_rev.c c.lib_rev.h
 
-obj/libc/c.lib_rev.o : c.lib_rev.c c.lib_rev.h
+obj/$(1)/%.o : CFLAGS += $(2)
-obj/soft-float/libc/c.lib_rev.o : c.lib_rev.c c.lib_rev.h
+obj/$(1)/%.o : %.c
-obj/small-data/libc/c.lib_rev.o : c.lib_rev.c c.lib_rev.h
+	@$$(COMPILE)
-obj/baserel/libc/c.lib_rev.o : c.lib_rev.c c.lib_rev.h
+
-obj.threadsafe/libc/c.lib_rev.o : c.lib_rev.c c.lib_rev.h
+obj.threadsafe/$(1)/%.o : CFLAGS += $(THREADSAFE) $(2)
-obj.threadsafe/soft-float/libc/c.lib_rev.o : c.lib_rev.c c.lib_rev.h
+obj.threadsafe/$(1)/%.o : %.c
-obj.threadsafe/small-data/libc/c.lib_rev.o : c.lib_rev.c c.lib_rev.h
+	@$$(COMPILE)
-obj.threadsafe/baserel/libc/c.lib_rev.o : c.lib_rev.c c.lib_rev.h
+
+lib/$(1).a : $$(addprefix obj/$(1)/,$$(C_LIB))
+	@$$(MAKELIB)
+
+lib.threadsafe/$(1).a : $$(addprefix obj.threadsafe/$(1)/,$$(C_LIB))
+	@$$(MAKELIB)
+
+endef
 
 ##############################################################################
 
-obj/libc/%.o : CFLAGS += $(LARGEDATA)
+$(eval $(call libc_rule,libc,$(LARGEDATA)))
-obj/libc/%.o : %.c
+$(eval $(call libc_rule,soft-float/libc,$(SOFTFLOAT)))
-	@$(COMPILE)
+$(eval $(call libc_rule,small-data/libc,$(SMALLDATA)))
-
+$(eval $(call libc_rule,baserel/libc,$(BASEREL)))
-obj/soft-float/libc/%.o : CFLAGS += $(SOFTFLOAT)
-obj/soft-float/libc/%.o : %.c
-	@$(COMPILE)
-
-obj/small-data/libc/%.o : CFLAGS += $(SMALLDATA)
-obj/small-data/libc/%.o : %.c
-	@$(COMPILE)
-
-obj/baserel/libc/%.o : CFLAGS += $(BASEREL)
-obj/baserel/libc/%.o : %.c
-	@$(COMPILE)
-
-obj.threadsafe/libc/%.o : CFLAGS += $(THREADSAFE) $(LARGEDATA)
-obj.threadsafe/libc/%.o : %.c
-	@$(COMPILE)
-
-obj.threadsafe/soft-float/libc/%.o : CFLAGS += $(THREADSAFE) $(SOFTFLOAT)
-obj.threadsafe/soft-float/libc/%.o : %.c
-	@$(COMPILE)
-
-obj.threadsafe/small-data/libc/%.o : CFLAGS += $(THREADSAFE) $(SMALLDATA)
-obj.threadsafe/small-data/libc/%.o : %.c
-	@$(COMPILE)
-
-obj.threadsafe/baserel/libc/%.o : CFLAGS += $(THREADSAFE) $(BASEREL)
-obj.threadsafe/baserel/libc/%.o : %.c
-	@$(COMPILE)
-
-##############################################################################
-
-lib/libc.a : $(addprefix obj/libc/,$(C_LIB))
-	@$(MAKELIB)
-
-lib/soft-float/libc.a : $(addprefix obj/soft-float/libc/,$(C_LIB))
-	@$(MAKELIB)
-
-lib/small-data/libc.a : $(addprefix obj/small-data/libc/,$(C_LIB))
-	@$(MAKELIB)
-
-lib/baserel/libc.a : $(addprefix obj/baserel/libc/,$(C_LIB))
-	@$(MAKELIB)
-
-lib.threadsafe/libc.a : $(addprefix obj.threadsafe/libc/,$(C_LIB))
-	@$(MAKELIB)
-
-lib.threadsafe/soft-float/libc.a : $(addprefix obj.threadsafe/soft-float/libc/,$(C_LIB))
-	@$(MAKELIB)
-
-lib.threadsafe/small-data/libc.a : $(addprefix obj.threadsafe/small-data/libc/,$(C_LIB))
-	@$(MAKELIB)
-
-lib.threadsafe/baserel/libc.a : $(addprefix obj.threadsafe/baserel/libc/,$(C_LIB))
-	@$(MAKELIB)

library/libc.obj.gmk

@@ -0,0 +1,363 @@
+# vim:ts=8 ft=make:
+#
+# -*- mode: makefile; -*-
+
+C_LIB_COMMON := \
+	c.lib_rev.o \
+	ctype_isalnum.o \
+	ctype_isalpha.o \
+	ctype_isascii.o \
+	ctype_isblank.o \
+	ctype_iscntrl.o \
+	ctype_isdigit.o \
+	ctype_isgraph.o \
+	ctype_islower.o \
+	ctype_isprint.o \
+	ctype_ispunct.o \
+	ctype_isspace.o \
+	ctype_isupper.o \
+	ctype_isxdigit.o \
+	ctype_table.o \
+	ctype_tolower.o \
+	ctype_toupper.o \
+	dirent_closedir.o \
+	dirent_opendir.o \
+	dirent_readdir.o \
+	dirent_rewinddir.o \
+	errno_data.o \
+	fcntl_close.o \
+	fcntl_creat.o \
+	fcntl_fcntl.o \
+	fcntl_get_default_file.o \
+	fcntl_lock.o \
+	fcntl_lseek.o \
+	fcntl_open.o \
+	fcntl_read.o \
+	fcntl_write.o \
+	ftw_ftw.o \
+	ftw_nftw.o \
+	inttypes_imaxdiv.o \
+	inttypes_imaxabs.o \
+	inttypes_strtoimax.o \
+	inttypes_strtoumax.o \
+	libgen_basename.o \
+	libgen_dirname.o \
+	locale_init_exit.o \
+	locale_localeconv.o \
+	locale_open_locale.o \
+	locale_setlocale.o \
+	mount_convertinfo.o \
+	mount_fstatfs.o \
+	mount_statfs.o \
+	signal_checkabort.o \
+	signal_data.o \
+	signal_kill.o \
+	signal_mask.o \
+	signal_raise.o \
+	signal_sigaddset.o \
+	signal_sigblock.o \
+	signal_sigemptyset.o \
+	signal_sigmask.o \
+	signal_signal.o \
+	signal_sigprocmask.o \
+	signal_sigsetmask.o \
+	stat_chmod.o \
+	stat_convertfileinfo.o \
+	stat_fchmod.o \
+	stat_fstat.o \
+	stat_lstat.o \
+	stat_lock.o \
+	stat_mkdir.o \
+	stat_rmdir.o \
+	stat_stat.o \
+	stat_umask.o \
+	stdio_asprintf.o \
+	stdio_change_fd_action.o \
+	stdio_change_fd_user_data.o \
+	stdio_clearerr.o \
+	stdio_dropiobreadbuffer.o \
+	stdio_duplicate_fd.o \
+	stdio_examine_fh.o \
+	stdio_fclose.o \
+	stdio_fdhookentry.o \
+	stdio_feof.o \
+	stdio_ferror.o \
+	stdio_fflush.o \
+	stdio_fgetc.o \
+	stdio_fgetpos.o \
+	stdio_fgets.o \
+	stdio_filliobreadbuffer.o \
+	stdio_findvacantfdentry.o \
+	stdio_findvacantiobentry.o \
+	stdio_flockfile.o \
+	stdio_flush.o \
+	stdio_flush_all_files.o \
+	stdio_flushiobwritebuffer.o \
+	stdio_fopen.o \
+	stdio_fprintf.o \
+	stdio_fputc.o \
+	stdio_fputs.o \
+	stdio_fread.o \
+	stdio_freopen.o \
+	stdio_fscanf.o \
+	stdio_fseek.o \
+	stdio_fseeko.o \
+	stdio_fsetpos.o \
+	stdio_ftell.o \
+	stdio_ftello.o \
+	stdio_ftrylockfile.o \
+	stdio_funlockfile.o \
+	stdio_fwrite.o \
+	stdio_getc.o \
+	stdio_getc_unlocked.o \
+	stdio_getchar.o \
+	stdio_getchar_unlocked.o \
+	stdio_gets.o \
+	stdio_get_fd.o \
+	stdio_get_file_descriptor.o \
+	stdio_growfdtable.o \
+	stdio_growiobtable.o \
+	stdio_grow_file.o \
+	stdio_initializefd.o \
+	stdio_initializeiob.o \
+	stdio_init_exit.o \
+	stdio_file_init.o \
+	stdio_iobhookentry.o \
+	stdio_lock.o \
+	stdio_locksemaphorename.o \
+	stdio_nostdio.o \
+	stdio_openiob.o \
+	stdio_parent_of_fh.o \
+	stdio_perror.o \
+	stdio_popen.o \
+	stdio_printf.o \
+	stdio_putc.o \
+	stdio_putc_unlocked.o \
+	stdio_putchar.o \
+	stdio_putchar_unlocked.o \
+	stdio_puts.o \
+	stdio_remove.o \
+	stdio_remove_fd_alias.o \
+	stdio_rename.o \
+	stdio_resolve_fd_file.o \
+	stdio_rewind.o \
+	stdio_scanf.o \
+	stdio_setbuf.o \
+	stdio_setvbuf.o \
+	stdio_snprintf.o \
+	stdio_sprintf.o \
+	stdio_sscanf.o \
+	stdio_sscanf_hook_entry.o \
+	stdio_tmpfile.o \
+	stdio_tmpnam.o \
+	stdio_translateioerror.o \
+	stdio_ungetc.o \
+	stdio_unlockfile.o \
+	stdio_vasprintf.o \
+	stdio_vasprintf_hook_entry.o \
+	stdio_vfprintf.o \
+	stdio_vfscanf.o \
+	stdio_vprintf.o \
+	stdio_vsnprintf.o \
+	stdio_vsnprintf_hook_entry.o \
+	stdio_vsprintf.o \
+	stdio_vsprintf_hook_entry.o \
+	stdio_vsscanf.o \
+	stdio_vscanf.o \
+	stdlib_abort.o \
+	stdlib_abs.o \
+	stdlib_alloca.o \
+	stdlib_alloca_cleanup.o \
+	stdlib_alloca_trap.o \
+	stdlib_assertion_failure.o \
+	stdlib_atexit.o \
+	stdlib_atoi.o \
+	stdlib_atol.o \
+	stdlib_atoll.o \
+	stdlib_bsearch.o \
+	stdlib_calloc.o \
+	stdlib_checkdetach.o \
+	stdlib_constructor.o \
+	stdlib_constructor_begin.o \
+	stdlib_default_pool_size.o \
+	stdlib_default_puddle_size.o \
+	stdlib_destructor.o \
+	stdlib_detach.o \
+	stdlib_disablerequesters.o \
+	stdlib_div.o \
+	stdlib_divsi3.o \
+	stdlib_divsi4.o \
+	stdlib_dosbase.o \
+	stdlib_exit.o \
+	stdlib_free.o \
+	stdlib_decay_unused_slabs.o \
+	stdlib_free_unused_slabs.o \
+	stdlib_getdefstacksize.o \
+	stdlib_getenv.o \
+	stdlib_getmemstats.o \
+	stdlib_getsp.o \
+	stdlib_get_errno.o \
+	stdlib_get_slab_usage.o \
+	stdlib_get_slab_allocations.o \
+	stdlib_get_slab_stats.o \
+	stdlib_isresident.o \
+	stdlib_labs.o \
+	stdlib_llabs.o \
+	stdlib_ldiv.o \
+	stdlib_lldiv.o \
+	stdlib_lib_main.o \
+	stdlib_lib_startup.o \
+	stdlib_machine_test.o \
+	stdlib_main.o \
+	stdlib_main_stub.o \
+	stdlib_malloc.o \
+	stdlib_math.o \
+	stdlib_mkdtemp.o \
+	stdlib_mkstemp.o \
+	stdlib_mktemp.o \
+	stdlib_modsi3.o \
+	stdlib_mulsi3.o \
+	stdlib_never_free.o \
+	stdlib_osliberror.o \
+	stdlib_oslibversion.o \
+	stdlib_priority.o \
+	stdlib_process_name.o \
+	stdlib_program_name.o \
+	stdlib_putenv.o \
+	stdlib_qsort.o \
+	stdlib_rand.o \
+	stdlib_rand_r.o \
+	stdlib_realloc.o \
+	stdlib_red_black.o \
+	stdlib_resetmemstats.o \
+	stdlib_semaphore.o \
+	stdlib_setenv.o \
+	stdlib_setjmp.o \
+	stdlib_set_errno.o \
+	stdlib_set_process_window.o \
+	stdlib_shell_escape.o \
+	stdlib_showerror.o \
+	stdlib_slab.o \
+	stdlib_slab_max_size.o \
+	stdlib_slab_purge_threshold.o \
+	stdlib_srand.o \
+	stdlib_stacksize.o \
+	stdlib_stack_usage.o \
+	stdlib_arg.o \
+	stdlib_stdio_window_spec.o \
+	stdlib_strtol.o \
+	stdlib_strtoll.o \
+	stdlib_strtoul.o \
+	stdlib_strtoull.o \
+	stdlib_swapstack.o \
+	stdlib_sysbase.o \
+	stdlib_system.o \
+	stdlib_termination_message.o \
+	stdlib_threshold.o \
+	stdlib_utilitybase.o \
+	stdlib_udivsi3.o \
+	stdlib_udivsi4.o \
+	stdlib_umodsi3.o \
+	stdlib_unsetenv.o \
+	strings_ffs.o \
+	strings_strcasecmp.o \
+	strings_strncasecmp.o \
+	string_bcmp.o \
+	string_bcopy.o \
+	string_bzero.o \
+	string_index.o \
+	string_memchr.o \
+	string_memcmp.o \
+	string_memcpy.o \
+	string_memmove.o \
+	string_memset.o \
+	string_rindex.o \
+	string_strcat.o \
+	string_strchr.o \
+	string_strcmp.o \
+	string_strcoll.o \
+	string_strcpy.o \
+	string_strcspn.o \
+	string_strdup.o \
+	string_strerror.o \
+	string_strerror_r.o \
+	string_strlcat.o \
+	string_strlcpy.o \
+	string_strlen.o \
+	string_strncat.o \
+	string_strncmp.o \
+	string_strncpy.o \
+	string_strpbrk.o \
+	string_strrchr.o \
+	string_strspn.o \
+	string_strstr.o \
+	string_strtok.o \
+	string_strtok_r.o \
+	string_strxfrm.o \
+	time_asctime.o \
+	time_asctime_r.o \
+	time_clock.o \
+	time_converttime.o \
+	time_convert_datestamp.o \
+	time_convert_time.o \
+	time_ctime.o \
+	time_ctime_r.o \
+	time_data.o \
+	time_days_per_date.o \
+	time_gettimeofday.o \
+	time_gmtime.o \
+	time_gmtime_r.o \
+	time_localtime.o \
+	time_localtime_r.o \
+	time_mktime.o \
+	time_numbertostring.o \
+	time_strftime.o \
+	time_time.o \
+	time_weekday.o \
+	uio_readv.o \
+	uio_writev.o \
+	ulimit_ulimit.o \
+	unistd_access.o \
+	unistd_chdir.o \
+	unistd_chdir_exit.o \
+	unistd_chown.o \
+	unistd_currentpathname.o \
+	unistd_dup.o \
+	unistd_dup2.o \
+	unistd_fchown.o \
+	unistd_fdatasync.o \
+	unistd_fdopen.o \
+	unistd_fileno.o \
+	unistd_fsync.o \
+	unistd_ftruncate.o \
+	unistd_getcwd.o \
+	unistd_getopt.o \
+	unistd_getpid.o \
+	unistd_init_exit.o \
+	unistd_isatty.o \
+	unistd_lchown.o \
+	unistd_link.o \
+	unistd_lockf.o \
+	unistd_readlink.o \
+	unistd_realpath.o \
+	unistd_sleep.o \
+	unistd_symlink.o \
+	unistd_sync_fd.o \
+	unistd_timer.o \
+	unistd_time_delay.o \
+	unistd_truncate.o \
+	unistd_unlink.o \
+	unistd_usleep.o \
+	utime_utime.o \
+	utsname_uname.o
+
+C_LIB_OS3 := \
+	unistd_unlink_retries.o
+
+C_LIB_OS4 := \
+	profile_profil.o \
+	stdlib_dlclose.o \
+	stdlib_dlerror.o \
+	stdlib_dlopen.o \
+	stdlib_dlsym.o \
+	stdlib_shared_objs.o

library/libdebug.gmk

@@ -1,125 +1,43 @@
 #
 # $Id: libdebug.gmk,v 1.1 2006-09-17 17:37:27 obarthel Exp $
 #
-# :ts=8
+# vim:ts=8 ft=make:
 #
 # -*- mode: makefile; -*-
 
 ##############################################################################
 
-LIBS += \
+include libdebug.obj.gmk
-	lib/libdebug.a \
-	lib/soft-float/libdebug.a \
-	lib/small-data/libdebug.a \
-	lib/baserel/libdebug.a \
-	lib.threadsafe/libdebug.a \
-	lib.threadsafe/soft-float/libdebug.a \
-	lib.threadsafe/small-data/libdebug.a \
-	lib.threadsafe/baserel/libdebug.a
 
 ##############################################################################
 
-DEBUG_LIB = \
+define libdebug_rule
-	debug.lib_rev.o \
-	debug.o \
-	debug_cmpstrexec.o \
-	debug_kcmpstr.o \
-	debug_kdofmt.o \
-	debug_kgetc.o \
-	debug_kgetch1.o \
-	debug_kgetch2.o \
-	debug_kgetchar1.o \
-	debug_kgetchar2.o \
-	debug_kgetnum1.o \
-	debug_kgetnum2.o \
-	debug_kmaygetch.o \
-	debug_kmaygetchar.o \
-	debug_kprintf1.o \
-	debug_kprintf2.o \
-	debug_kputc.o \
-	debug_kputch1.o \
-	debug_kputch2.o \
-	debug_kputchar1.o \
-	debug_kputchar2.o \
-	debug_kputfmt.o \
-	debug_kputs1.o \
-	debug_kputs2.o \
-	debug_kputstr1.o \
-	debug_kputstr2.o \
-	debug_kvprintf1.o \
-	debug_kvprintf2.o \
-	debug_level.o
 
-##############################################################################
+LIBS += lib/$(1).a lib.threadsafe/$(1).a
 
 # Dependencies to rebuild if the library version changes
+obj/$(1)/debug.lib_rev.o : debug.lib_rev.c debug.lib_rev.h
+obj.threadsafe/$(1)/debug.lib_rev.o : debug.lib_rev.c debug.lib_rev.h
 
-obj/libdebug/debug.lib_rev.o : debug.lib_rev.c debug.lib_rev.h
+obj/$(1)/%.o : CFLAGS += $(2)
-obj/soft-float/libdebug/debug.lib_rev.o : debug.lib_rev.c debug.lib_rev.h
+obj/$(1)/%.o : %.c
-obj/small-data/libdebug/debug.lib_rev.o : debug.lib_rev.c debug.lib_rev.h
+	@$$(COMPILE)
-obj/baserel/libdebug/debug.lib_rev.o : debug.lib_rev.c debug.lib_rev.h
+
-obj.threadsafe/libdebug/debug.lib_rev.o : debug.lib_rev.c debug.lib_rev.h
+obj.threadsafe/$(1)/%.o : CFLAGS += $(THREADSAFE) $(2)
-obj.threadsafe/soft-float/libdebug/debug.lib_rev.o : debug.lib_rev.c debug.lib_rev.h
+obj.threadsafe/$(1)/%.o : %.c
-obj.threadsafe/small-data/libdebug/debug.lib_rev.o : debug.lib_rev.c debug.lib_rev.h
+	@$$(COMPILE)
-obj.threadsafe/baserel/libdebug/debug.lib_rev.o : debug.lib_rev.c debug.lib_rev.h
+
+lib/$(1).a : $$(addprefix obj/$(1)/,$$(DEBUG_LIB))
+	@$$(MAKELIB)
+
+lib.threadsafe/$(1).a : $$(addprefix obj.threadsafe/$(1)/,$$(DEBUG_LIB))
+	@$$(MAKELIB)
+
+endef
 
 ##############################################################################
 
-
+$(eval $(call libdebug_rule,libdebug,$(LARGEDATA)))
-obj/libdebug/%.o : CFLAGS += $(LARGEDATA)
+$(eval $(call libdebug_rule,soft-float/libdebug,$(SOFTFLOAT)))
-obj/libdebug/%.o : %.c
+$(eval $(call libdebug_rule,small-data/libdebug,$(SMALLDATA)))
-	@$(COMPILE)
+$(eval $(call libdebug_rule,baserel/libdebug,$(BASEREL)))
-
-obj/soft-float/libdebug/%.o : CFLAGS += $(SOFTFLOAT)
-obj/soft-float/libdebug/%.o : %.c
-	@$(COMPILE)
-
-obj/small-data/libdebug/%.o : CFLAGS += $(SMALLDATA)
-obj/small-data/libdebug/%.o : %.c
-	@$(COMPILE)
-
-obj/baserel/libdebug/%.o : CFLAGS += $(BASEREL)
-obj/baserel/libdebug/%.o : %.c
-	@$(COMPILE)
-
-obj.threadsafe/libdebug/%.o : CFLAGS += $(THREADSAFE) $(LARGEDATA)
-obj.threadsafe/libdebug/%.o : %.c
-	@$(COMPILE)
-
-obj.threadsafe/soft-float/libdebug/%.o : CFLAGS += $(THREADSAFE) $(SOFTFLOAT)
-obj.threadsafe/soft-float/libdebug/%.o : %.c
-	@$(COMPILE)
-
-obj.threadsafe/small-data/libdebug/%.o : CFLAGS += $(THREADSAFE) $(SMALLDATA)
-obj.threadsafe/small-data/libdebug/%.o : %.c
-	@$(COMPILE)
-
-obj.threadsafe/baserel/libdebug/%.o : CFLAGS += $(THREADSAFE) $(BASEREL)
-obj.threadsafe/baserel/libdebug/%.o : %.c
-	@$(COMPILE)
-
-##############################################################################
-
-lib/libdebug.a : $(addprefix obj/libdebug/,$(DEBUG_LIB))
-	@$(MAKELIB)
-
-lib/soft-float/libdebug.a : $(addprefix obj/soft-float/libdebug/,$(DEBUG_LIB))
-	@$(MAKELIB)
-
-lib/small-data/libdebug.a : $(addprefix obj/small-data/libdebug/,$(DEBUG_LIB))
-	@$(MAKELIB)
-
-lib/baserel/libdebug.a : $(addprefix obj/baserel/libdebug/,$(DEBUG_LIB))
-	@$(MAKELIB)
-
-lib.threadsafe/libdebug.a : $(addprefix obj.threadsafe/libdebug/,$(DEBUG_LIB))
-	@$(MAKELIB)
-
-lib.threadsafe/soft-float/libdebug.a : $(addprefix obj.threadsafe/soft-float/libdebug/,$(DEBUG_LIB))
-	@$(MAKELIB)
-
-lib.threadsafe/small-data/libdebug.a : $(addprefix obj.threadsafe/small-data/libdebug/,$(DEBUG_LIB))
-	@$(MAKELIB)
-
-lib.threadsafe/baserel/libdebug.a : $(addprefix obj.threadsafe/baserel/libdebug/,$(DEBUG_LIB))
-	@$(MAKELIB)

library/libdebug.obj.gmk

@@ -0,0 +1,34 @@
+# vim:ts=8 ft=make:
+#
+# -*- mode: makefile; -*-
+
+DEBUG_LIB := \
+	debug.lib_rev.o \
+	debug.o \
+	debug_cmpstrexec.o \
+	debug_kcmpstr.o \
+	debug_kdofmt.o \
+	debug_kgetc.o \
+	debug_kgetch1.o \
+	debug_kgetch2.o \
+	debug_kgetchar1.o \
+	debug_kgetchar2.o \
+	debug_kgetnum1.o \
+	debug_kgetnum2.o \
+	debug_kmaygetch.o \
+	debug_kmaygetchar.o \
+	debug_kprintf1.o \
+	debug_kprintf2.o \
+	debug_kputc.o \
+	debug_kputch1.o \
+	debug_kputch2.o \
+	debug_kputchar1.o \
+	debug_kputchar2.o \
+	debug_kputfmt.o \
+	debug_kputs1.o \
+	debug_kputs2.o \
+	debug_kputstr1.o \
+	debug_kputstr2.o \
+	debug_kvprintf1.o \
+	debug_kvprintf2.o \
+	debug_level.o

library/libm.gmk

@@ -1,265 +1,48 @@
 #
 # $Id: libm.gmk,v 1.3 2007-01-06 10:09:48 obarthel Exp $
 #
-# :ts=8
+# vim:ts=8 ft=make:
 #
 # -*- mode: makefile; -*-
 
 ##############################################################################
 
-LIBS += \
+include libm.obj.gmk
-	lib/libm.a \
+MATH_LIB := $(sort $(MATH_LIB_COMMON) $(MATH_LIB_OS4))
-	lib/soft-float/libm.a \
-	lib/small-data/libm.a \
-	lib/baserel/libm.a \
-	lib.threadsafe/libm.a \
-	lib.threadsafe/soft-float/libm.a \
-	lib.threadsafe/small-data/libm.a \
-	lib.threadsafe/baserel/libm.a
 
 ##############################################################################
 
-MATH_LIB := \
+define libm_rule
-	complex_carg.o \
-	complex_cargf.o \
-	complex_cargl.o \
-	complex_cimag.o \
-	complex_cimagf.o \
-	complex_cimagl.o \
-	complex_conj.o \
-	complex_conjf.o \
-	complex_conjl.o \
-	complex_creal.o \
-	complex_crealf.o \
-	complex_creall.o \
-	fenv_feclearexcept.o \
-	fenv_fegetenv.o \
-	fenv_fegetexceptflag.o \
-	fenv_fegetround.o \
-	fenv_feholdexcept.o \
-	fenv_feraiseexcept.o \
-	fenv_fesetenv.o \
-	fenv_fesetexceptflag.o \
-	fenv_fetestexcept.o \
-	fenv_fetestround.o \
-	fenv_feupdateenv.o \
-	math_acos.o \
-	math_acosf.o \
-	math_acosh.o \
-	math_acoshf.o \
-	math_asin.o \
-	math_asinf.o \
-	math_asinh.o \
-	math_asinhf.o \
-	math_atan.o \
-	math_atan2.o \
-	math_atan2f.o \
-	math_atanf.o \
-	math_atanh.o \
-	math_atanhf.o \
-	math_cbrt.o \
-	math_cbrtf.o \
-	math_ceil.o \
-	math_ceilf.o \
-	math_copysign.o \
-	math_copysignf.o \
-	math_cos.o \
-	math_cosf.o \
-	math_cosh.o \
-	math_coshf.o \
-	math_erf.o \
-	math_erfc.o \
-	math_erfcf.o \
-	math_erff.o \
-	math_exp.o \
-	math_exp2.o \
-	math_exp2f.o \
-	math_expf.o \
-	math_expm1.o \
-	math_expm1f.o \
-	math_fabs.o \
-	math_fabsf.o \
-	math_fdim.o \
-	math_fdimf.o \
-	math_floor.o \
-	math_floorf.o \
-	math_fma.o \
-	math_fmaf.o \
-	math_fmax.o \
-	math_fmaxf.o \
-	math_fmin.o \
-	math_fminf.o \
-	math_fmod.o \
-	math_fmodf.o \
-	math_fpclassify.o \
-	math_frexp.o \
-	math_frexpf.o \
-	math_huge_val.o \
-	math_huge_valf.o \
-	math_hypot.o \
-	math_hypotf.o \
-	math_ilogb.o \
-	math_ilogbf.o \
-	math_inf.o \
-	math_inff.o \
-	math_init_exit.o \
-	math_isfinite.o \
-	math_isunordered.o \
-	math_kernel_cos.o \
-	math_kernel_cosf.o \
-	math_kernel_expm1.o \
-	math_kernel_rem_pio2.o \
-	math_kernel_sin.o \
-	math_kernel_sinf.o \
-	math_kernel_tan.o \
-	math_kernel_tanf.o \
-	math_ldexp.o \
-	math_ldexpf.o \
-	math_lgamma.o \
-	math_lgammaf.o \
-	math_llrint.o \
-	math_log.o \
-	math_log10.o \
-	math_log10f.o \
-	math_log1p.o \
-	math_log1pf.o \
-	math_log2.o \
-	math_log2f.o \
-	math_logb.o \
-	math_logbf.o \
-	math_logf.o \
-	math_lrint.o \
-	math_lrintf.o \
-	math_lround.o \
-	math_lroundf.o \
-	math_modf.o \
-	math_modff.o \
-	math_nan.o \
-	math_nanf.o \
-	math_nearbyint.o \
-	math_nearbyintf.o \
-	math_nextafter.o \
-	math_nextafterf.o \
-	math_pow.o \
-	math_powf.o \
-	math_remainder.o \
-	math_remainderf.o \
-	math_remquo.o \
-	math_remquof.o \
-	math_rem_pio2f.o \
-	math_rint.o \
-	math_rintf.o \
-	math_round.o \
-	math_roundf.o \
-	math_scalbn.o \
-	math_scalbnf.o \
-	math_signbit.o \
-	math_sin.o \
-	math_sinf.o \
-	math_sinh.o \
-	math_sinhf.o \
-	math_sqrt.o \
-	math_sqrtf.o \
-	math_tan.o \
-	math_tanf.o \
-	math_tanh.o \
-	math_tanhf.o \
-	math_tgamma.o \
-	math_tgammaf.o \
-	math_trunc.o \
-	math_truncf.o \
-	stdio_asprintf.o \
-	stdio_flush.o \
-	stdio_flush_all_files.o \
-	stdio_fprintf.o \
-	stdio_fscanf.o \
-	stdio_printf.o \
-	stdio_scanf.o \
-	stdio_snprintf.o \
-	stdio_sprintf.o \
-	stdio_sscanf.o \
-	stdio_vasprintf.o \
-	stdio_vfprintf.o \
-	stdio_vfscanf.o \
-	stdio_vsscanf.o \
-	stdio_vscanf.o \
-	stdio_vprintf.o \
-	stdio_vsnprintf.o \
-	stdio_vsprintf.o \
-	stdlib_atof.o \
-	stdlib_strtod.o \
-	stdlib_strtof.o \
-	time_difftime.o
 
-##############################################################################
+LIBS += lib/$(1).a lib.threadsafe/$(1).a
 
 # Dependencies to rebuild if the library version changes
+obj/$(1)/m.lib_rev.o : m.lib_rev.c m.lib_rev.h
+obj.threadsafe/$(1)/m.lib_rev.o : m.lib_rev.c m.lib_rev.h
 
-obj/libm/m.lib_rev.o : m.lib_rev.c m.lib_rev.h
+obj/$(1)/%.o : CFLAGS += $(2)
-obj/soft-float/libm/m.lib_rev.o : m.lib_rev.c m.lib_rev.h
+obj/$(1)/%.o : %.c
-obj/small-data/libm/m.lib_rev.o : m.lib_rev.c m.lib_rev.h
+	@$$(COMPILE)
-obj/baserel/libm/m.lib_rev.o : m.lib_rev.c m.lib_rev.h
+
-obj.threadsafe/libm/m.lib_rev.o : m.lib_rev.c m.lib_rev.h
+obj.threadsafe/$(1)/%.o : CFLAGS += $(THREADSAFE) $(2)
-obj.threadsafe/soft-float/libm/m.lib_rev.o : m.lib_rev.c m.lib_rev.h
+obj.threadsafe/$(1)/%.o : %.c
-obj.threadsafe/small-data/libm/m.lib_rev.o : m.lib_rev.c m.lib_rev.h
+	@$$(COMPILE)
-obj.threadsafe/baserel/libm/m.lib_rev.o : m.lib_rev.c m.lib_rev.h
+
+lib/$(1).a : $$(addprefix obj/$(1)/,$$(MATH_LIB))
+	@$$(MAKELIB)
+
+lib.threadsafe/$(1).a : $$(addprefix obj.threadsafe/$(1)/,$$(MATH_LIB))
+	@$$(MAKELIB)
+
+endef
 
 ##############################################################################
 
-obj/libm/%.o : CFLAGS += $(LARGEDATA) -DPPC_FLOATING_POINT_SUPPORT
+$(eval $(call libm_rule,libm, \
-obj/libm/%.o : %.c
+        $(LARGEDATA) -DPPC_FLOATING_POINT_SUPPORT))
-	@$(COMPILE)
+$(eval $(call libm_rule,soft-float/libm, \
-
+        $(SOFTFLOAT)))
-obj/soft-float/libm/%.o : CFLAGS += $(SOFTFLOAT)
+$(eval $(call libm_rule,small-data/libm, \
-obj/soft-float/libm/%.o : %.c
+        $(SMALLDATA) -DPPC_FLOATING_POINT_SUPPORT))
-	@$(COMPILE)
+$(eval $(call libm_rule,baserel/libm, \
-
+        $(BASEREL) -DPPC_FLOATING_POINT_SUPPORT))
-obj/small-data/libm/%.o : CFLAGS += $(SMALLDATA) -DPPC_FLOATING_POINT_SUPPORT
-obj/small-data/libm/%.o : %.c
-	@$(COMPILE)
-
-obj/baserel/libm/%.o : CFLAGS += $(BASEREL) -DPPC_FLOATING_POINT_SUPPORT
-obj/baserel/libm/%.o : %.c
-	@$(COMPILE)
-
-obj.threadsafe/libm/%.o : CFLAGS += $(THREADSAFE) $(LARGEDATA) -DPPC_FLOATING_POINT_SUPPORT
-obj.threadsafe/libm/%.o : %.c
-	@$(COMPILE)
-
-obj.threadsafe/soft-float/libm/%.o : CFLAGS += $(THREADSAFE) $(SOFTFLOAT)
-obj.threadsafe/soft-float/libm/%.o : %.c
-	@$(COMPILE)
-
-obj.threadsafe/small-data/libm/%.o : CFLAGS += $(THREADSAFE) $(SMALLDATA) -DPPC_FLOATING_POINT_SUPPORT
-obj.threadsafe/small-data/libm/%.o : %.c
-	@$(COMPILE)
-
-obj.threadsafe/baserel/libm/%.o : CFLAGS += $(THREADSAFE) $(BASEREL) -DPPC_FLOATING_POINT_SUPPORT
-obj.threadsafe/baserel/libm/%.o : %.c
-	@$(COMPILE)
-
-##############################################################################
-
-lib/libm.a : $(addprefix obj/libm/,$(MATH_LIB))
-	@$(MAKELIB)
-
-lib/soft-float/libm.a : $(addprefix obj/soft-float/libm/,$(MATH_LIB))
-	@$(MAKELIB)
-
-lib/small-data/libm.a : $(addprefix obj/small-data/libm/,$(MATH_LIB))
-	@$(MAKELIB)
-
-lib/baserel/libm.a : $(addprefix obj/baserel/libm/,$(MATH_LIB))
-	@$(MAKELIB)
-
-lib.threadsafe/libm.a : $(addprefix obj.threadsafe/libm/,$(MATH_LIB))
-	@$(MAKELIB)
-
-lib.threadsafe/soft-float/libm.a : $(addprefix obj.threadsafe/soft-float/libm/,$(MATH_LIB))
-	@$(MAKELIB)
-
-lib.threadsafe/small-data/libm.a : $(addprefix obj.threadsafe/small-data/libm/,$(MATH_LIB))
-	@$(MAKELIB)
-
-lib.threadsafe/baserel/libm.a : $(addprefix obj.threadsafe/baserel/libm/,$(MATH_LIB))
-	@$(MAKELIB)

library/libm.obj.gmk

@@ -0,0 +1,215 @@
+# vim:ts=8 ft=make:
+#
+# -*- mode: makefile; -*-
+
+MATH_LIB_COMMON := \
+	complex_carg.o \
+	complex_cargf.o \
+	complex_cargl.o \
+	complex_cimag.o \
+	complex_cimagf.o \
+	complex_cimagl.o \
+	complex_conj.o \
+	complex_conjf.o \
+	complex_conjl.o \
+	complex_creal.o \
+	complex_crealf.o \
+	complex_creall.o \
+	fenv_feclearexcept.o \
+	fenv_fegetenv.o \
+	fenv_fegetexceptflag.o \
+	fenv_fegetround.o \
+	fenv_feholdexcept.o \
+	fenv_feraiseexcept.o \
+	fenv_fesetenv.o \
+	fenv_fesetexceptflag.o \
+	fenv_fetestexcept.o \
+	fenv_fetestround.o \
+	fenv_feupdateenv.o \
+	math_acos.o \
+	math_acosf.o \
+	math_acosh.o \
+	math_acoshf.o \
+	math_asin.o \
+	math_asinf.o \
+	math_asinh.o \
+	math_asinhf.o \
+	math_atan.o \
+	math_atan2.o \
+	math_atan2f.o \
+	math_atanf.o \
+	math_atanh.o \
+	math_atanhf.o \
+	math_cbrt.o \
+	math_cbrtf.o \
+	math_ceil.o \
+	math_ceilf.o \
+	math_copysign.o \
+	math_copysignf.o \
+	math_cos.o \
+	math_cosf.o \
+	math_cosh.o \
+	math_coshf.o \
+	math_erf.o \
+	math_erfc.o \
+	math_erfcf.o \
+	math_erff.o \
+	math_exp.o \
+	math_exp2.o \
+	math_exp2f.o \
+	math_expf.o \
+	math_expm1.o \
+	math_expm1f.o \
+	math_fabs.o \
+	math_fabsf.o \
+	math_fdim.o \
+	math_fdimf.o \
+	math_floor.o \
+	math_floorf.o \
+	math_fma.o \
+	math_fmaf.o \
+	math_fmax.o \
+	math_fmaxf.o \
+	math_fmin.o \
+	math_fminf.o \
+	math_fmod.o \
+	math_fmodf.o \
+	math_fpclassify.o \
+	math_frexp.o \
+	math_frexpf.o \
+	math_huge_val.o \
+	math_huge_valf.o \
+	math_hypot.o \
+	math_hypotf.o \
+	math_ilogb.o \
+	math_ilogbf.o \
+	math_inf.o \
+	math_inff.o \
+	math_init_exit.o \
+	math_isfinite.o \
+	math_isunordered.o \
+	math_kernel_cosf.o \
+	math_kernel_sinf.o \
+	math_kernel_tanf.o \
+	math_ldexp.o \
+	math_ldexpf.o \
+	math_lgamma.o \
+	math_lgammaf.o \
+	math_llrint.o \
+	math_log.o \
+	math_log10.o \
+	math_log10f.o \
+	math_log1p.o \
+	math_log1pf.o \
+	math_log2.o \
+	math_log2f.o \
+	math_logb.o \
+	math_logbf.o \
+	math_logf.o \
+	math_lrint.o \
+	math_lrintf.o \
+	math_lround.o \
+	math_lroundf.o \
+	math_modf.o \
+	math_modff.o \
+	math_nan.o \
+	math_nanf.o \
+	math_nearbyint.o \
+	math_nearbyintf.o \
+	math_nextafter.o \
+	math_nextafterf.o \
+	math_pow.o \
+	math_powf.o \
+	math_remainder.o \
+	math_remainderf.o \
+	math_remquo.o \
+	math_remquof.o \
+	math_rem_pio2f.o \
+	math_rint.o \
+	math_rintf.o \
+	math_round.o \
+	math_roundf.o \
+	math_scalbn.o \
+	math_scalbnf.o \
+	math_signbit.o \
+	math_sin.o \
+	math_sinf.o \
+	math_sinh.o \
+	math_sinhf.o \
+	math_sqrt.o \
+	math_sqrtf.o \
+	math_tan.o \
+	math_tanf.o \
+	math_tanh.o \
+	math_tanhf.o \
+	math_tgamma.o \
+	math_tgammaf.o \
+	math_trunc.o \
+	math_truncf.o \
+	stdio_asprintf.o \
+	stdio_flush.o \
+	stdio_flush_all_files.o \
+	stdio_fprintf.o \
+	stdio_fscanf.o \
+	stdio_printf.o \
+	stdio_scanf.o \
+	stdio_snprintf.o \
+	stdio_sprintf.o \
+	stdio_sscanf.o \
+	stdio_vasprintf.o \
+	stdio_vfprintf.o \
+	stdio_vfscanf.o \
+	stdio_vsscanf.o \
+	stdio_vscanf.o \
+	stdio_vprintf.o \
+	stdio_vsnprintf.o \
+	stdio_vsprintf.o \
+	stdlib_atof.o \
+	stdlib_strtod.o \
+	stdlib_strtof.o \
+	time_difftime.o
+
+MATH_LIB_881 = \
+	m881.lib_rev.o \
+	$(MATH_LIB_COMMON)
+
+MATH_LIB_IEEE = \
+	m.lib_rev.o \
+	$(MATH_LIB_COMMON) \
+	math_adddf3.o \
+	math_addsf3.o \
+	math_divdf3.o \
+	math_divsf3.o \
+	math_eqdf2.o \
+	math_eqsf2.o \
+	math_extendsfdf2.o \
+	math_fixdfsi.o \
+	math_fixsfsi.o \
+	math_fixunsdfsi.o \
+	math_fixunssfsi.o \
+	math_floatsidf.o \
+	math_floatsisf.o \
+	math_gedf2.o \
+	math_gesf2.o \
+	math_gtdf2.o \
+	math_gtsf2.o \
+	math_ledf2.o \
+	math_lesf2.o \
+	math_ltdf2.o \
+	math_ltsf2.o \
+	math_muldf3.o \
+	math_mulsf3.o \
+	math_nedf2.o \
+	math_negdf2.o \
+	math_negsf2.o \
+	math_nesf2.o \
+	math_subdf3.o \
+	math_subsf3.o \
+	math_truncdfsf2.o
+
+MATH_LIB_OS4 := \
+	math_kernel_cos.o \
+	math_kernel_expm1.o \
+	math_kernel_rem_pio2.o \
+	math_kernel_sin.o \
+	math_kernel_tan.o

library/libnet.gmk

@@ -1,174 +1,47 @@
 #
 # $Id: libnet.gmk,v 1.1 2006-09-17 17:37:27 obarthel Exp $
 #
-# :ts=8
+# vim:ts=8 ft=make:
 #
 # -*- mode: makefile; -*-
 
 ##############################################################################
 
-LIBS += \
+include libnet.obj.gmk
-	lib/libnet.a \
-	lib/soft-float/libnet.a \
-	lib/small-data/libnet.a \
-	lib/baserel/libnet.a \
-	lib.threadsafe/libnet.a \
-	lib.threadsafe/soft-float/libnet.a \
-	lib.threadsafe/small-data/libnet.a \
-	lib.threadsafe/baserel/libnet.a
 
 ##############################################################################
 
-NET_LIB := \
+define libnet_rule
-	net.lib_rev.o \
-	socket_accept.o \
-	socket_bind.o \
-	socket_check_daemon.o \
-	socket_connect.o \
-	socket_gethostbyaddr.o \
-	socket_gethostbyname.o \
-	socket_gethostid.o \
-	socket_gethostname.o \
-	socket_getnetbyaddr.o \
-	socket_getnetbyname.o \
-	socket_getpeername.o \
-	socket_getprotobyname.o \
-	socket_getprotobynumber.o \
-	socket_getservbyname.o \
-	socket_getservbyport.o \
-	socket_getsockname.o \
-	socket_getsockopt.o \
-	socket_get_descriptor.o \
-	socket_inet_addr.o \
-	socket_inet_aton.o \
-	socket_inet_lnaof.o \
-	socket_inet_makeaddr.o \
-	socket_inet_netof.o \
-	socket_inet_network.o \
-	socket_inet_ntoa.o \
-	socket_init_exit.o \
-	socket_ioctl.o \
-	socket_isdaemon.o \
-	socket_listen.o \
-	socket_obtain_daemon.o \
-	socket_recv.o \
-	socket_recvfrom.o \
-	socket_recvmsg.o \
-	socket_select_signal.o \
-	socket_select.o \
-	socket_wait_select.o \
-	socket_send.o \
-	socket_sendmsg.o \
-	socket_sendto.o \
-	socket_setsockopt.o \
-	socket_shutdown.o \
-	socket_socket.o \
-	socket_hook_entry.o \
-	socket_hstrerror.o \
-	socket_get_h_errno.o \
-	socket_set_h_errno.o \
-	systeminfo_sysinfo.o \
-	stat_umask.o \
-	usergroup_crypt.o \
-	usergroup_data.o \
-	usergroup_endgrent.o \
-	usergroup_endpwent.o \
-	usergroup_getegid.o \
-	usergroup_geteuid.o \
-	usergroup_getgid.o \
-	usergroup_getgrent.o \
-	usergroup_getgrgid.o \
-	usergroup_getgrnam.o \
-	usergroup_getgroups.o \
-	usergroup_getpass.o \
-	usergroup_getpwent.o \
-	usergroup_getpwnam.o \
-	usergroup_getpwuid.o \
-	usergroup_getuid.o \
-	usergroup_initgroups.o \
-	usergroup_init_exit.o \
-	usergroup_rootmode.o \
-	usergroup_setegid.o \
-	usergroup_seteuid.o \
-	usergroup_setgid.o \
-	usergroup_setgrent.o \
-	usergroup_setgroups.o \
-	usergroup_setpwent.o \
-	usergroup_setregid.o \
-	usergroup_setreuid.o \
-	usergroup_setsid.o \
-	usergroup_setuid.o \
-	utsname_uname.o
 
-##############################################################################
+LIBS += lib/$(1).a lib.threadsafe/$(1).a
 
 # Dependencies to rebuild if the library version changes
+obj/$(1)/net.lib_rev.o : net.lib_rev.c net.lib_rev.h
+obj.threadsafe/$(1)/net.lib_rev.o : net.lib_rev.c net.lib_rev.h
 
-obj/libnet/net.lib_rev.o : net.lib_rev.c net.lib_rev.h
+obj/$(1)/%.o : CFLAGS += $(2)
-obj/soft-float/libnet/net.lib_rev.o : net.lib_rev.c net.lib_rev.h
+obj/$(1)/%.o : %.c
-obj/small-data/libnet/net.lib_rev.o : net.lib_rev.c net.lib_rev.h
+	@$$(COMPILE)
-obj/baserel/libnet/net.lib_rev.o : net.lib_rev.c net.lib_rev.h
+
-obj.threadsafe/libnet/net.lib_rev.o : net.lib_rev.c net.lib_rev.h
+obj.threadsafe/$(1)/%.o : CFLAGS += $(THREADSAFE) $(2)
-obj.threadsafe/soft-float/libnet/net.lib_rev.o : net.lib_rev.c net.lib_rev.h
+obj.threadsafe/$(1)/%.o : %.c
-obj.threadsafe/small-data/libnet/net.lib_rev.o : net.lib_rev.c net.lib_rev.h
+	@$$(COMPILE)
-obj.threadsafe/baserel/libnet/net.lib_rev.o : net.lib_rev.c net.lib_rev.h
+
+lib/$(1).a : $$(addprefix obj/$(1)/,$$(NET_LIB))
+	@$$(MAKELIB)
+
+lib.threadsafe/$(1).a : $$(addprefix obj.threadsafe/$(1)/,$$(NET_LIB))
+	@$$(MAKELIB)
+
+endef
 
 ##############################################################################
 
-obj/libnet/%.o : CFLAGS += $(LARGEDATA) -I$(NET_INCLUDE) -DSOCKET_SUPPORT -DUSERGROUP_SUPPORT
+$(eval $(call libnet_rule,libnet, \
-obj/libnet/%.o : %.c
+	$(LARGEDATA) -I$(NET_INCLUDE) -DSOCKET_SUPPORT -DUSERGROUP_SUPPORT))
-	@$(COMPILE)
+$(eval $(call libnet_rule,soft-float/libnet, \
-
+	 $(SOFTFLOAT) -I$(NET_INCLUDE) -DSOCKET_SUPPORT -DUSERGROUP_SUPPORT))
-obj/soft-float/libnet/%.o : CFLAGS += $(SOFTFLOAT) -I$(NET_INCLUDE) -DSOCKET_SUPPORT -DUSERGROUP_SUPPORT
+$(eval $(call libnet_rule,small-data/libnet, \
-obj/soft-float/libnet/%.o : %.c
+        $(SMALLDATA) -I$(NET_INCLUDE) -DSOCKET_SUPPORT -DUSERGROUP_SUPPORT))
-	@$(COMPILE)
+$(eval $(call libnet_rule,baserel/libnet, \
-
+        $(BASEREL) -I$(NET_INCLUDE) -DSOCKET_SUPPORT -DUSERGROUP_SUPPORT))
-obj/small-data/libnet/%.o : CFLAGS += $(SMALLDATA) -I$(NET_INCLUDE) -DSOCKET_SUPPORT -DUSERGROUP_SUPPORT
-obj/small-data/libnet/%.o : %.c
-	@$(COMPILE)
-
-obj/baserel/libnet/%.o : CFLAGS += $(BASEREL) -I$(NET_INCLUDE) -DSOCKET_SUPPORT -DUSERGROUP_SUPPORT
-obj/baserel/libnet/%.o : %.c
-	@$(COMPILE)
-
-obj.threadsafe/libnet/%.o : CFLAGS += $(THREADSAFE) $(LARGEDATA) -I$(NET_INCLUDE) -DSOCKET_SUPPORT -DUSERGROUP_SUPPORT
-obj.threadsafe/libnet/%.o : %.c
-	@$(COMPILE)
-
-obj.threadsafe/soft-float/libnet/%.o : CFLAGS += $(THREADSAFE) $(SOFTFLOAT) -I$(NET_INCLUDE) -DSOCKET_SUPPORT -DUSERGROUP_SUPPORT
-obj.threadsafe/soft-float/libnet/%.o : %.c
-	@$(COMPILE)
-
-obj.threadsafe/small-data/libnet/%.o : CFLAGS += $(THREADSAFE) $(SMALLDATA) -I$(NET_INCLUDE) -DSOCKET_SUPPORT -DUSERGROUP_SUPPORT
-obj.threadsafe/small-data/libnet/%.o : %.c
-	@$(COMPILE)
-
-obj.threadsafe/baserel/libnet/%.o : CFLAGS += $(THREADSAFE) $(BASEREL) -I$(NET_INCLUDE) -DSOCKET_SUPPORT -DUSERGROUP_SUPPORT
-obj.threadsafe/baserel/libnet/%.o : %.c
-	@$(COMPILE)
-
-##############################################################################
-
-lib/libnet.a : $(addprefix obj/libnet/,$(NET_LIB))
-	@$(MAKELIB)
-
-lib/soft-float/libnet.a : $(addprefix obj/soft-float/libnet/,$(NET_LIB))
-	@$(MAKELIB)
-
-lib/small-data/libnet.a : $(addprefix obj/small-data/libnet/,$(NET_LIB))
-	@$(MAKELIB)
-
-lib/baserel/libnet.a : $(addprefix obj/baserel/libnet/,$(NET_LIB))
-	@$(MAKELIB)
-
-lib.threadsafe/libnet.a : $(addprefix obj.threadsafe/libnet/,$(NET_LIB))
-	@$(MAKELIB)
-
-lib.threadsafe/soft-float/libnet.a : $(addprefix obj.threadsafe/soft-float/libnet/,$(NET_LIB))
-	@$(MAKELIB)
-
-lib.threadsafe/small-data/libnet.a : $(addprefix obj.threadsafe/small-data/libnet/,$(NET_LIB))
-	@$(MAKELIB)
-
-lib.threadsafe/baserel/libnet.a : $(addprefix obj.threadsafe/baserel/libnet/,$(NET_LIB))
-	@$(MAKELIB)

library/libnet.obj.gmk

@@ -0,0 +1,84 @@
+# vim:ts=8 ft=make:
+#
+# -*- mode: makefile; -*-
+
+NET_LIB := \
+	net.lib_rev.o \
+	socket_accept.o \
+	socket_bind.o \
+	socket_check_daemon.o \
+	socket_connect.o \
+	socket_gethostbyaddr.o \
+	socket_gethostbyname.o \
+	socket_gethostid.o \
+	socket_gethostname.o \
+	socket_getnetbyaddr.o \
+	socket_getnetbyname.o \
+	socket_getpeername.o \
+	socket_getprotobyname.o \
+	socket_getprotobynumber.o \
+	socket_getservbyname.o \
+	socket_getservbyport.o \
+	socket_getsockname.o \
+	socket_getsockopt.o \
+	socket_get_descriptor.o \
+	socket_inet_addr.o \
+	socket_inet_aton.o \
+	socket_inet_lnaof.o \
+	socket_inet_makeaddr.o \
+	socket_inet_netof.o \
+	socket_inet_network.o \
+	socket_inet_ntoa.o \
+	socket_init_exit.o \
+	socket_ioctl.o \
+	socket_isdaemon.o \
+	socket_listen.o \
+	socket_obtain_daemon.o \
+	socket_recv.o \
+	socket_recvfrom.o \
+	socket_recvmsg.o \
+	socket_select_signal.o \
+	socket_select.o \
+	socket_wait_select.o \
+	socket_send.o \
+	socket_sendmsg.o \
+	socket_sendto.o \
+	socket_setsockopt.o \
+	socket_shutdown.o \
+	socket_socket.o \
+	socket_hook_entry.o \
+	socket_hstrerror.o \
+	socket_get_h_errno.o \
+	socket_set_h_errno.o \
+	systeminfo_sysinfo.o \
+	stat_umask.o \
+	usergroup_crypt.o \
+	usergroup_data.o \
+	usergroup_endgrent.o \
+	usergroup_endpwent.o \
+	usergroup_getegid.o \
+	usergroup_geteuid.o \
+	usergroup_getgid.o \
+	usergroup_getgrent.o \
+	usergroup_getgrgid.o \
+	usergroup_getgrnam.o \
+	usergroup_getgroups.o \
+	usergroup_getpass.o \
+	usergroup_getpwent.o \
+	usergroup_getpwnam.o \
+	usergroup_getpwuid.o \
+	usergroup_getuid.o \
+	usergroup_initgroups.o \
+	usergroup_init_exit.o \
+	usergroup_rootmode.o \
+	usergroup_setegid.o \
+	usergroup_seteuid.o \
+	usergroup_setgid.o \
+	usergroup_setgrent.o \
+	usergroup_setgroups.o \
+	usergroup_setpwent.o \
+	usergroup_setregid.o \
+	usergroup_setreuid.o \
+	usergroup_setsid.o \
+	usergroup_setuid.o \
+	utsname_uname.o

library/libprofile.gmk

@@ -1,132 +1,51 @@
 #
 # $Id: libprofile.gmk,v 1.1 2006-09-17 17:37:27 obarthel Exp $
 #
-# :ts=8
+# vim:ts=8 ft=make:
 #
 # -*- mode: makefile; -*-
 
 ##############################################################################
 
-LIBS += \
+include libprofile.obj.gmk
-	lib/libprofile.a \
-	lib/soft-float/libprofile.a \
-	lib/small-data/libprofile.a \
-	lib/baserel/libprofile.a \
-	lib.threadsafe/libprofile.a \
-	lib.threadsafe/soft-float/libprofile.a \
-	lib.threadsafe/small-data/libprofile.a \
-	lib.threadsafe/baserel/libprofile.a
 
 ##############################################################################
 
-PROFILE_LIB = \
+define libprofile_rule
-	profile__mcount.o \
-	profile_gmon.o \
-	profile_mcount.o
 
-##############################################################################
+LIBS += lib/$(1).a lib.threadsafe/$(1).a
 
 # Dependencies to rebuild if the library version changes
+obj/$(1)/profile.lib_rev.o : profile.lib_rev.c profile.lib_rev.h
+obj.threadsafe/$(1)/profile.lib_rev.o : profile.lib_rev.c profile.lib_rev.h
 
-obj/libprofile/profile.lib_rev.o : profile.lib_rev.c profile.lib_rev.h
+obj/$(1)/%.o : CFLAGS += $(2)
-obj/soft-float/libprofile/profile.lib_rev.o : profile.lib_rev.c profile.lib_rev.h
+obj/$(1)/%.o : %.c
-obj/small-data/libprofile/profile.lib_rev.o : profile.lib_rev.c profile.lib_rev.h
+	@$$(COMPILE)
-obj/baserel/libprofile/profile.lib_rev.o : profile.lib_rev.c profile.lib_rev.h
+
-obj.threadsafe/libprofile/profile.lib_rev.o : profile.lib_rev.c profile.lib_rev.h
+obj/$(1)/%.o : AFLAGS += $(2)
-obj.threadsafe/soft-float/libprofile/profile.lib_rev.o : profile.lib_rev.c profile.lib_rev.h
+obj/$(1)/%.o : %.S
-obj.threadsafe/small-data/libprofile/profile.lib_rev.o : profile.lib_rev.c profile.lib_rev.h
+	@$$(ASSEMBLE)
-obj.threadsafe/baserel/libprofile/profile.lib_rev.o : profile.lib_rev.c profile.lib_rev.h
+
+obj.threadsafe/$(1)/%.o : CFLAGS += $(THREADSAFE) $(2)
+obj.threadsafe/$(1)/%.o : %.c
+	@$$(COMPILE)
+
+obj.threadsafe/$(1)/%.o : AFLAGS += $(2)
+obj.threadsafe/$(1)/%.o : %.S
+	@$$(ASSEMBLE)
+
+lib/$(1).a : $$(addprefix obj/$(1)/,$$(PROFILE_LIB))
+	@$$(MAKELIB)
+
+lib.threadsafe/$(1).a : $$(addprefix obj.threadsafe/$(1)/,$$(PROFILE_LIB))
+	@$$(MAKELIB)
+
+endef
 
 ##############################################################################
 
-obj/libprofile/%.o : AFLAGS += $(LARGEDATA)
+$(eval $(call libprofile_rule,libprofile,$(LARGEDATA)))
-obj/libprofile/%.o : %.S
+$(eval $(call libprofile_rule,soft-float/libprofile,$(SOFTFLOAT)))
-	@$(ASSEMBLE)
+$(eval $(call libprofile_rule,small-data/libprofile,$(SMALLDATA)))
-
+$(eval $(call libprofile_rule,baserel/libprofile,$(BASEREL)))
-obj/soft-float/libprofile/%.o : AFLAGS += $(SOFTFLOAT)
-obj/soft-float/libprofile/%.o : %.S
-	@$(ASSEMBLE)
-
-obj/small-data/libprofile/%.o : AFLAGS += $(SMALLDATA)
-obj/small-data/libprofile/%.o : %.S
-	@$(ASSEMBLE)
-
-obj/baserel/libprofile/%.o : AFLAGS += $(BASEREL)
-obj/baserel/libprofile/%.o : %.S
-	@$(ASSEMBLE)
-
-obj.threadsafe/libprofile/%.o : AFLAGS += $(LARGEDATA)
-obj.threadsafe/libprofile/%.o : %.S
-	@$(ASSEMBLE)
-
-obj.threadsafe/soft-float/libprofile/%.o : AFLAGS += $(SOFTFLOAT)
-obj.threadsafe/soft-float/libprofile/%.o : %.S
-	@$(ASSEMBLE)
-
-obj.threadsafe/small-data/libprofile/%.o : AFLAGS += $(SMALLDATA)
-obj.threadsafe/small-data/libprofile/%.o : %.S
-	@$(ASSEMBLE)
-
-obj.threadsafe/baserel/libprofile/%.o : AFLAGS += $(BASEREL)
-obj.threadsafe/baserel/libprofile/%.o : %.S
-	@$(ASSEMBLE)
-
-##############################################################################
-
-obj/libprofile/%.o : CFLAGS += $(LARGEDATA)
-obj/libprofile/%.o : %.c
-	@$(COMPILE)
-
-obj/soft-float/libprofile/%.o : CFLAGS += $(SOFTFLOAT)
-obj/soft-float/libprofile/%.o : %.c
-	@$(COMPILE)
-
-obj/small-data/libprofile/%.o : CFLAGS += $(SMALLDATA)
-obj/small-data/libprofile/%.o : %.c
-	@$(COMPILE)
-
-obj/baserel/libprofile/%.o : CFLAGS += $(BASEREL)
-obj/baserel/libprofile/%.o : %.c
-	@$(COMPILE)
-
-obj.threadsafe/libprofile/%.o : CFLAGS += $(THREADSAFE) $(LARGEDATA)
-obj.threadsafe/libprofile/%.o : %.c
-	@$(COMPILE)
-
-obj.threadsafe/soft-float/libprofile/%.o : CFLAGS += $(THREADSAFE) $(SOFTFLOAT)
-obj.threadsafe/soft-float/libprofile/%.o : %.c
-	@$(COMPILE)
-
-obj.threadsafe/small-data/libprofile/%.o : CFLAGS += $(THREADSAFE) $(SMALLDATA)
-obj.threadsafe/small-data/libprofile/%.o : %.c
-	@$(COMPILE)
-
-obj.threadsafe/baserel/libprofile/%.o : CFLAGS += $(THREADSAFE) $(BASEREL)
-obj.threadsafe/baserel/libprofile/%.o : %.c
-	@$(COMPILE)
-
-##############################################################################
-
-lib/libprofile.a : $(addprefix obj/libprofile/,$(PROFILE_LIB))
-	@$(MAKELIB)
-
-lib/soft-float/libprofile.a : $(addprefix obj/soft-float/libprofile/,$(PROFILE_LIB))
-	@$(MAKELIB)
-
-lib/small-data/libprofile.a : $(addprefix obj/small-data/libprofile/,$(PROFILE_LIB))
-	@$(MAKELIB)
-
-lib/baserel/libprofile.a : $(addprefix obj/baserel/libprofile/,$(PROFILE_LIB))
-	@$(MAKELIB)
-
-lib.threadsafe/libprofile.a : $(addprefix obj.threadsafe/libprofile/,$(PROFILE_LIB))
-	@$(MAKELIB)
-
-lib.threadsafe/soft-float/libprofile.a : $(addprefix obj.threadsafe/soft-float/libprofile/,$(PROFILE_LIB))
-	@$(MAKELIB)
-
-lib.threadsafe/small-data/libprofile.a : $(addprefix obj.threadsafe/small-data/libprofile/,$(PROFILE_LIB))
-	@$(MAKELIB)
-
-lib.threadsafe/baserel/libprofile.a : $(addprefix obj.threadsafe/baserel/libprofile/,$(PROFILE_LIB))
-	@$(MAKELIB)

library/libprofile.obj.gmk

@@ -0,0 +1,8 @@
+# vim:ts=8 ft=make:
+#
+# -*- mode: makefile; -*-
+
+PROFILE_LIB = \
+	profile__mcount.o \
+	profile_gmon.o \
+	profile_mcount.o

library/libunix.gmk

@@ -1,203 +1,48 @@
 #
 # $Id: libunix.gmk,v 1.4 2010-08-21 10:59:34 obarthel Exp $
 #
-# :ts=8
+# vim:ts=8 ft=make:
 #
 # -*- mode: makefile; -*-
 
 ##############################################################################
 
-LIBS += \
+include libunix.obj.gmk
-	lib/libunix.a \
+UNIX_LIB := $(sort $(UNIX_LIB_COMMON) $(UNIX_LIB_OS4))
-	lib/soft-float/libunix.a \
-	lib/small-data/libunix.a \
-	lib/baserel/libunix.a \
-	lib.threadsafe/libunix.a \
-	lib.threadsafe/soft-float/libunix.a \
-	lib.threadsafe/small-data/libunix.a \
-	lib.threadsafe/baserel/libunix.a
 
 ##############################################################################
 
-UNIX_LIB := \
+define libunix_rule
-	unix.lib_rev.o \
-	dirent_closedir.o \
-	dirent_rewinddir.o \
-	dirent_opendir.o \
-	dirent_readdir.o \
-	fcntl_creat.o \
-	fcntl_fcntl.o \
-	fcntl_open.o \
-	fcntl_get_default_file.o \
-	getopt_getopt_long.o \
-	mount_convertinfo.o \
-	mount_statfs.o \
-	resource_getrlimit.o \
-	resource_setrlimit.o \
-	stat_chmod.o \
-	stat_fstat.o \
-	stat_lstat.o \
-	stat_lock.o \
-	stat_mkdir.o \
-	stat_rmdir.o \
-	stat_stat.o \
-	stdio_ctermid.o \
-	stdio_fdhookentry.o \
-	stdio_fflush.o \
-	stdio_fopen.o \
-	stdio_file_init.o \
-	stdio_init_exit.o \
-	stdio_locksemaphorename.o \
-	stdio_openiob.o \
-	stdio_popen.o \
-	stdio_record_locking.o \
-	stdio_remove.o \
-	stdio_rename.o \
-	stdlib_alloca.o \
-	stdlib_alloca_cleanup.o \
-	stdlib_alloca_trap.o \
-	stdlib_arg.o \
-	stdlib_dlopen.o \
-	stdlib_expand_wildcard.o \
-	stdlib_expand_wildcard_check.o \
-	stdlib_getmemstats.o \
-	stdlib_main.o \
-	stdlib_main_stub.o \
-	stdlib_mkdtemp.o \
-	stdlib_mkstemp.o \
-	stdlib_mktemp.o \
-	stdlib_malloc.o \
-	stdlib_realloc.o \
-	stdlib_resetmemstats.o \
-	stdlib_system.o \
-	systeminfo_sysinfo.o \
-	termios_cfgetispeed.o \
-	termios_cfgetospeed.o \
-	termios_cfmakeraw.o \
-	termios_cfsetispeed.o \
-	termios_cfsetospeed.o \
-	termios_console_fdhookentry.o \
-	termios_openserial.o \
-	termios_tcdrain.o \
-	termios_tcflow.o \
-	termios_tcflush.o \
-	termios_tcgetattr.o \
-	termios_tcsendbreak.o \
-	termios_tcsetattr.o \
-	timeb_ftime.o \
-	uio_readv.o \
-	uio_writev.o \
-	unistd_access.o \
-	unistd_chdir.o \
-	unistd_chdir_exit.o \
-	unistd_chown.o \
-	unistd_common_pathconf.o \
-	unistd_def_path.o \
-	unistd_def_path_delimiter.o \
-	unistd_environ.o \
-	unistd_execl.o \
-	unistd_execle.o \
-	unistd_execlp.o \
-	unistd_execv.o \
-	unistd_execve.o \
-	unistd_execve_env_exit.o \
-	unistd_execve_env_init.o \
-	unistd_execve_exit.o \
-	unistd_execvp.o \
-	unistd_fpathconf.o \
-	unistd_getcwd.o \
-	unistd_lchown.o \
-	unistd_link.o \
-	unistd_lockf.o \
-	unistd_pathconf.o \
-	unistd_readlink.o \
-	unistd_realpath.o \
-	unistd_restorepathname.o \
-	unistd_setcurrentpath.o \
-	unistd_strip_double_slash.o \
-	unistd_symlink.o \
-	unistd_translatea2u.o \
-	unistd_translaterel.o \
-	unistd_translateu2a.o \
-	unistd_truncate.o \
-	unistd_ttyname.o \
-	unistd_ttyname_r.o \
-	unistd_unix_path_semantics.o \
-	unistd_unlink.o \
-	unistd_unlink_retries.o \
-	unistd_wildcard_expand.o \
-	utime_utime.o
 
-##############################################################################
+LIBS += lib/$(1).a lib.threadsafe/$(1).a
 
 # Dependencies to rebuild if the library version changes
+obj/$(1)/unix.lib_rev.o : unix.lib_rev.c unix.lib_rev.h
+obj.threadsafe/$(1)/unix.lib_rev.o : unix.lib_rev.c unix.lib_rev.h
 
-obj/libunix/unit.lib_rev.o : unit.lib_rev.c unit.lib_rev.h
+obj/$(1)/%.o : CFLAGS += $(2)
-obj/soft-float/libunix/unit.lib_rev.o : unit.lib_rev.c unit.lib_rev.h
+obj/$(1)/%.o : %.c
-obj/small-data/libunix/unit.lib_rev.o : unit.lib_rev.c unit.lib_rev.h
+	@$$(COMPILE)
-obj/baserel/libunix/unit.lib_rev.o : unit.lib_rev.c unit.lib_rev.h
+
-obj.threadsafe/libunix/unit.lib_rev.o : unit.lib_rev.c unit.lib_rev.h
+obj.threadsafe/$(1)/%.o : CFLAGS += $(THREADSAFE) $(2)
-obj.threadsafe/soft-float/libunix/unit.lib_rev.o : unit.lib_rev.c unit.lib_rev.h
+obj.threadsafe/$(1)/%.o : %.c
-obj.threadsafe/small-data/libunix/unit.lib_rev.o : unit.lib_rev.c unit.lib_rev.h
+	@$$(COMPILE)
-obj.threadsafe/baserel/libunix/unit.lib_rev.o : unit.lib_rev.c unit.lib_rev.h
+
+lib/$(1).a : $$(addprefix obj/$(1)/,$$(UNIX_LIB))
+	@$$(MAKELIB)
+
+lib.threadsafe/$(1).a : $$(addprefix obj.threadsafe/$(1)/,$$(UNIX_LIB))
+	@$$(MAKELIB)
+
+endef
 
 ##############################################################################
 
-
+$(eval $(call libunix_rule,libunix, \
-obj/libunix/%.o : CFLAGS += $(LARGEDATA) -DUNIX_PATH_SEMANTICS
+        $(LARGEDATA) -DUNIX_PATH_SEMANTICS))
-obj/libunix/%.o : %.c
+$(eval $(call libunix_rule,soft-float/libunix, \
-	@$(COMPILE)
+        $(SOFTFLOAT) -DUNIX_PATH_SEMANTICS))
-
+$(eval $(call libunix_rule,small-data/libunix, \
-obj/soft-float/libunix/%.o : CFLAGS += $(SOFTFLOAT) -DUNIX_PATH_SEMANTICS
+        $(SMALLDATA) -DUNIX_PATH_SEMANTICS))
-obj/soft-float/libunix/%.o : %.c
+$(eval $(call libunix_rule,baserel/libunix, \
-	@$(COMPILE)
+        $(BASEREL) -DUNIX_PATH_SEMANTICS))
-
-obj/small-data/libunix/%.o : CFLAGS += $(SMALLDATA) -DUNIX_PATH_SEMANTICS
-obj/small-data/libunix/%.o : %.c
-	@$(COMPILE)
-
-obj/baserel/libunix/%.o : CFLAGS += $(BASEREL) -DUNIX_PATH_SEMANTICS
-obj/baserel/libunix/%.o : %.c
-	@$(COMPILE)
-
-obj.threadsafe/libunix/%.o : CFLAGS += $(THREADSAFE) $(LARGEDATA) -DUNIX_PATH_SEMANTICS
-obj.threadsafe/libunix/%.o : %.c
-	@$(COMPILE)
-
-obj.threadsafe/soft-float/libunix/%.o : CFLAGS += $(THREADSAFE) $(SOFTFLOAT) -DUNIX_PATH_SEMANTICS
-obj.threadsafe/soft-float/libunix/%.o : %.c
-	@$(COMPILE)
-
-obj.threadsafe/small-data/libunix/%.o : CFLAGS += $(THREADSAFE) $(SMALLDATA) -DUNIX_PATH_SEMANTICS
-obj.threadsafe/small-data/libunix/%.o : %.c
-	@$(COMPILE)
-
-obj.threadsafe/baserel/libunix/%.o : CFLAGS += $(THREADSAFE) $(BASEREL) -DUNIX_PATH_SEMANTICS
-obj.threadsafe/baserel/libunix/%.o : %.c
-	@$(COMPILE)
-
-##############################################################################
-
-lib/libunix.a : $(addprefix obj/libunix/,$(UNIX_LIB))
-	@$(MAKELIB)
-
-lib/soft-float/libunix.a : $(addprefix obj/soft-float/libunix/,$(UNIX_LIB))
-	@$(MAKELIB)
-
-lib/small-data/libunix.a : $(addprefix obj/small-data/libunix/,$(UNIX_LIB))
-	@$(MAKELIB)
-
-lib/baserel/libunix.a : $(addprefix obj/baserel/libunix/,$(UNIX_LIB))
-	@$(MAKELIB)
-
-lib.threadsafe/libunix.a : $(addprefix obj.threadsafe/libunix/,$(UNIX_LIB))
-	@$(MAKELIB)
-
-lib.threadsafe/soft-float/libunix.a : $(addprefix obj.threadsafe/soft-float/libunix/,$(UNIX_LIB))
-	@$(MAKELIB)
-
-lib.threadsafe/small-data/libunix.a : $(addprefix obj.threadsafe/small-data/libunix/,$(UNIX_LIB))
-	@$(MAKELIB)
-
-lib.threadsafe/baserel/libunix.a : $(addprefix obj.threadsafe/baserel/libunix/,$(UNIX_LIB))
-	@$(MAKELIB)

library/libunix.obj.gmk

@@ -0,0 +1,116 @@
+# vim:ts=8 ft=make:
+#
+# -*- mode: makefile; -*-
+
+UNIX_LIB_COMMON := \
+	unix.lib_rev.o \
+	dirent_closedir.o \
+	dirent_rewinddir.o \
+	dirent_opendir.o \
+	dirent_readdir.o \
+	fcntl_creat.o \
+	fcntl_fcntl.o \
+	fcntl_open.o \
+	fcntl_get_default_file.o \
+	getopt_getopt_long.o \
+	mount_convertinfo.o \
+	mount_statfs.o \
+	resource_getrlimit.o \
+	resource_setrlimit.o \
+	stat_chmod.o \
+	stat_fstat.o \
+	stat_lstat.o \
+	stat_lock.o \
+	stat_mkdir.o \
+	stat_rmdir.o \
+	stat_stat.o \
+	stdio_ctermid.o \
+	stdio_fdhookentry.o \
+	stdio_fflush.o \
+	stdio_fopen.o \
+	stdio_file_init.o \
+	stdio_init_exit.o \
+	stdio_locksemaphorename.o \
+	stdio_openiob.o \
+	stdio_popen.o \
+	stdio_record_locking.o \
+	stdio_remove.o \
+	stdio_rename.o \
+	stdlib_alloca.o \
+	stdlib_alloca_cleanup.o \
+	stdlib_alloca_trap.o \
+	stdlib_arg.o \
+	stdlib_expand_wildcard.o \
+	stdlib_expand_wildcard_check.o \
+	stdlib_getmemstats.o \
+	stdlib_main.o \
+	stdlib_main_stub.o \
+	stdlib_mkdtemp.o \
+	stdlib_mkstemp.o \
+	stdlib_mktemp.o \
+	stdlib_malloc.o \
+	stdlib_realloc.o \
+	stdlib_resetmemstats.o \
+	stdlib_system.o \
+	systeminfo_sysinfo.o \
+	termios_cfgetispeed.o \
+	termios_cfgetospeed.o \
+	termios_cfmakeraw.o \
+	termios_cfsetispeed.o \
+	termios_cfsetospeed.o \
+	termios_console_fdhookentry.o \
+	termios_tcdrain.o \
+	termios_tcflow.o \
+	termios_tcflush.o \
+	termios_tcgetattr.o \
+	termios_tcsendbreak.o \
+	termios_tcsetattr.o \
+	timeb_ftime.o \
+	uio_readv.o \
+	uio_writev.o \
+	unistd_access.o \
+	unistd_chdir.o \
+	unistd_chdir_exit.o \
+	unistd_chown.o \
+	unistd_common_pathconf.o \
+	unistd_def_path.o \
+	unistd_def_path_delimiter.o \
+	unistd_environ.o \
+	unistd_execl.o \
+	unistd_execle.o \
+	unistd_execlp.o \
+	unistd_execv.o \
+	unistd_execve.o \
+	unistd_execve_env_exit.o \
+	unistd_execve_env_init.o \
+	unistd_execve_exit.o \
+	unistd_execvp.o \
+	unistd_fpathconf.o \
+	unistd_getcwd.o \
+	unistd_lchown.o \
+	unistd_link.o \
+	unistd_lockf.o \
+	unistd_pathconf.o \
+	unistd_readlink.o \
+	unistd_realpath.o \
+	unistd_restorepathname.o \
+	unistd_setcurrentpath.o \
+	unistd_strip_double_slash.o \
+	unistd_symlink.o \
+	unistd_translatea2u.o \
+	unistd_translaterel.o \
+	unistd_translateu2a.o \
+	unistd_truncate.o \
+	unistd_ttyname.o \
+	unistd_ttyname_r.o \
+	unistd_unix_path_semantics.o \
+	unistd_unlink.o \
+	unistd_wildcard_expand.o \
+	utime_utime.o
+
+UNIX_LIB_OS3 :=
+
+UNIX_LIB_OS4 := \
+	stdlib_dlopen.o \
+	termios_openserial.o \
+	unistd_unlink_retries.o