~ chicken-core (chicken-5) 200e63870b8468ba09d48e1a8b29b0a57a940921

commit 200e63870b8468ba09d48e1a8b29b0a57a940921
Author:     Evan Hanson <evhan@foldling.org>
AuthorDate: Fri Jul 10 10:46:45 2015 +1200
Commit:     Evan Hanson <evhan@foldling.org>
CommitDate: Fri Jul 10 10:46:45 2015 +1200

    Simplify import library Makefile definitions
    
    The foreign import library doesn't really need its own definition. Also,
    specify which import libraries live under the "chicken" namespace.

diff --git a/defaults.make b/defaults.make
index f44411a5..2dcba32a 100644
--- a/defaults.make
+++ b/defaults.make
@@ -267,9 +267,8 @@ CHICKEN_PROGRAM_OPTIONS += $(if $(PROFILE_OBJECTS),-profile)
 
 # import libraries
 
-PRIMITIVE_IMPORT_LIBRARIES = chicken csi
-POSIX_IMPORT_LIBRARY = posix
-FOREIGN_IMPORT_LIBRARY = foreign
+PRIMITIVE_IMPORT_LIBRARIES = chicken csi chicken.foreign
+POSIX_IMPORT_LIBRARY = chicken.posix
 DYNAMIC_IMPORT_LIBRARIES = setup-api setup-download srfi-4
 DYNAMIC_CHICKEN_IMPORT_LIBRARIES = data-structures eval expand extras \
 	files irregex lolevel ports tcp utils
@@ -284,8 +283,7 @@ CHICKEN_INSTALL_PROGRAM = $(PROGRAM_PREFIX)chicken-install$(PROGRAM_SUFFIX)
 CHICKEN_UNINSTALL_PROGRAM = $(PROGRAM_PREFIX)chicken-uninstall$(PROGRAM_SUFFIX)
 CHICKEN_STATUS_PROGRAM = $(PROGRAM_PREFIX)chicken-status$(PROGRAM_SUFFIX)
 CHICKEN_BUG_PROGRAM = $(PROGRAM_PREFIX)chicken-bug$(PROGRAM_SUFFIX)
-IMPORT_LIBRARIES = chicken.$(POSIX_IMPORT_LIBRARY) \
-		   chicken.$(FOREIGN_IMPORT_LIBRARY) \
+IMPORT_LIBRARIES = $(POSIX_IMPORT_LIBRARY) \
 		   $(DYNAMIC_IMPORT_LIBRARIES) \
 		   $(PRIMITIVE_IMPORT_LIBRARIES) \
 		   $(foreach lib,$(DYNAMIC_CHICKEN_IMPORT_LIBRARIES),chicken.$(lib))
diff --git a/rules.make b/rules.make
index fa2b9b36..08ddf55b 100644
--- a/rules.make
+++ b/rules.make
@@ -503,6 +503,9 @@ $(foreach lib, $(SETUP_API_OBJECTS_1),\
           $(eval $(call declare-emitted-import-lib-dependency,$(lib))))
 
 $(foreach lib, $(DYNAMIC_IMPORT_LIBRARIES),\
+          $(eval $(call declare-emitted-import-lib-dependency,$(lib))))
+
+$(foreach lib, $(DYNAMIC_CHICKEN_IMPORT_LIBRARIES),\
           $(eval $(call declare-emitted-chicken-import-lib-dependency,$(lib))))
 
 $(foreach lib, $(filter-out chicken,$(COMPILER_OBJECTS_1)),\