c/makefile: group files in rough categories

src/c/Makefile.in

@@ -40,42 +40,49 @@ includedir=@includedir@
 # Files
 
 HDIR	= ../ecl
-HFILES = $(HDIR)/config.h $(HDIR)/ecl.h $(HDIR)/ecl-cmp.h          \
-	$(HDIR)/object.h $(HDIR)/cs.h $(HDIR)/stacks.h                  \
-	$(HDIR)/external.h $(HDIR)/cons.h $(HDIR)/legacy.h              \
-	$(HDIR)/number.h $(HDIR)/page.h $(HDIR)/bytecodes.h             \
-   $(HDIR)/cache.h $(HDIR)/config-internal.h $(HDIR)/ecl_atomics.h \
-   $(HDIR)/ecl-inl.h $(HDIR)/internal.h $(HDIR)/stack-resize.h     \
-   $(HDIR)/threads.h $(HDIR)/impl/math_dispatch2.h                 \
-   $(HDIR)/impl/math_dispatch.h  $(HDIR)/impl/math_fenv.h          \
-   $(HDIR)/impl/math_fenv_msvc.h
+
+HFILES = $(HDIR)/config.h $(HDIR)/ecl.h $(HDIR)/ecl-cmp.h $(HDIR)/object.h      \
+	$(HDIR)/cs.h $(HDIR)/stacks.h $(HDIR)/external.h $(HDIR)/cons.h         \
+	$(HDIR)/legacy.h $(HDIR)/number.h $(HDIR)/page.h $(HDIR)/bytecodes.h    \
+	$(HDIR)/cache.h $(HDIR)/config-internal.h $(HDIR)/ecl_atomics.h         \
+	$(HDIR)/ecl-inl.h $(HDIR)/internal.h $(HDIR)/stack-resize.h             \
+	$(HDIR)/threads.h $(HDIR)/impl/math_dispatch2.h                         \
+	$(HDIR)/impl/math_dispatch.h $(HDIR)/impl/math_fenv.h                   \
+	$(HDIR)/impl/math_fenv_msvc.h $(HDIR)/nucleus.h
+
+BOOT_OBJS =
+
 CLOS_OBJS = clos/cache.o clos/accessor.o clos/instance.o clos/gfun.o
-OBJS = main.o symbol.o package.o cons.o list.o apply.o eval.o      \
-	interpreter.o compiler.o disassembler.o $(CLOS_OBJS)            \
-	reference.o character.o file.o read.o print.o error.o           \
-	string.o cfun.o reader/parse_integer.o reader/parse_number.o    \
-	printer/float_to_digits.o printer/float_to_string.o             \
-	printer/integer_to_string.o printer/write_ugly.o                \
-	printer/write_object.o printer/write_symbol.o                   \
-	printer/write_array.o printer/write_list.o                      \
-	printer/write_code.o printer/write_sse.o                        \
-	printer/print_unreadable.o ffi/libraries.o ffi/backtrace.o      \
-	ffi/mmap.o ffi/cdata.o numbers/cos.o numbers/sin.o              \
-	numbers/tan.o numbers/atan.o numbers/cosh.o numbers/sinh.o      \
-	numbers/tanh.o numbers/exp.o numbers/expt.o numbers/log.o       \
-	numbers/sqrt.o numbers/abs.o numbers/zerop.o numbers/plusp.o    \
-	numbers/minusp.o numbers/negate.o numbers/conjugate.o           \
-	numbers/one_plus.o numbers/one_minus.o numbers/plus.o           \
-	numbers/minus.o numbers/times.o numbers/divide.o                \
-	numbers/number_compare.o numbers/number_equalp.o                \
-	numbers/minmax.o numbers/floor.o numbers/ceiling.o              \
-	numbers/round.o numbers/truncate.o typespec.o assignment.o      \
-	memory.o predicate.o number.o num_pred.o num_arith.o num_co.o   \
-	num_log.o num_rand.o array.o vector_push.o sequence.o           \
-	cmpaux.o macros.o backq.o stacks.o time.o unixint.o mapfun.o    \
-	multival.o hash.o format.o pathname.o structure.o load.o        \
-	unixfsys.o unixsys.o serialize.o ffi.o sse2.o @EXTRA_OBJS@      \
-	threads/atomic.o process.o
+
+NUM_OBJS = number.o num_pred.o num_arith.o num_co.o num_log.o num_rand.o        \
+	numbers/cos.o numbers/sin.o numbers/tan.o numbers/atan.o                \
+	numbers/cosh.o numbers/sinh.o numbers/tanh.o numbers/exp.o              \
+	numbers/expt.o numbers/log.o numbers/sqrt.o numbers/abs.o               \
+	numbers/zerop.o numbers/plusp.o numbers/minusp.o numbers/negate.o       \
+	numbers/conjugate.o numbers/one_plus.o numbers/one_minus.o              \
+	numbers/plus.o numbers/minus.o numbers/times.o numbers/divide.o         \
+	numbers/number_compare.o numbers/number_equalp.o numbers/minmax.o       \
+	numbers/floor.o numbers/ceiling.o numbers/round.o numbers/truncate.o
+
+WRITER_OBJS = print.o printer/float_to_digits.o printer/float_to_string.o       \
+	printer/integer_to_string.o printer/write_ugly.o                        \
+	printer/write_object.o printer/write_symbol.o printer/write_array.o     \
+	printer/write_list.o printer/write_code.o printer/write_sse.o           \
+	printer/print_unreadable.o
+
+READER_OBJS = read.o reader/parse_integer.o reader/parse_number.o
+
+FFI_OBJS = ffi.o ffi/libraries.o ffi/backtrace.o ffi/mmap.o ffi/cdata.o
+
+OBJS = main.o symbol.o package.o cons.o list.o apply.o eval.o interpreter.o     \
+	compiler.o disassembler.o reference.o character.o error.o               \
+	string.o cfun.o typespec.o assignment.o memory.o predicate.o array.o    \
+	vector_push.o sequence.o cmpaux.o macros.o backq.o stacks.o time.o      \
+	unixint.o mapfun.o multival.o hash.o format.o pathname.o structure.o    \
+	load.o unixfsys.o unixsys.o serialize.o sse2.o threads/atomic.o         \
+        process.o                                                               \
+	$(BOOT_OBJS) $(NUM_OBJS) $(WRITER_OBJS) $(READER_OBJS)                  \
+	$(CLOS_OBJS) $(FFI_OBJS) @EXTRA_OBJS@
 
 .PHONY: all
 

src/h/nucleus.h

@@ -0,0 +1,9 @@
+/* -*- Mode: C; c-basic-offset: 2; indent-tabs-mode: nil -*- */
+/* vim: set filetype=c tabstop=2 shiftwidth=2 expandtab: */
+
+#ifndef ECL_NUCLEUS_H
+#define ECL_NUCLEUS_H
+
+#include "external.h"
+
+#endif  /* ECL_NUCLEUS_H */