Changeset 2712

Timestamp:

Jul 16, 2006, 4:48:59 AM (19 years ago)

Author:

bird

Message:

Configured lazy import libs.

Location:

trunk/libc

Files:

• Makefile.kmk (modified) (1 diff)
• src/libc/libc.def (modified) (1 diff)
• src/libos2/Makefile.kmk (modified) (2 diffs)

trunk/libc/Makefile.kmk

@@ -128 +128 @@
         $(TARGET_libc) \
         $(TARGET_libc_asm) \
+        $(TARGET_libos2_unicode_lazy) \
         $(TARGET_libos2) \
         $(PATH_TARGET)/libc_alias/libc_alias.a \

trunk/libc/src/libc/libc.def

@@ -267 +267 @@
     "___lazyimp_resolver" @280
     "___lazyimp_resolver2" @281
-;fixme    "___lazyldr_libuni_resolver" @282
-;fixme    "___lazyldr_uconv_resolver" @283
+    "___lazyldr_libuni_resolver" @282
+    "___lazyldr_uconv_resolver" @283
     "___libc_Back_fibDumpAll" @284
     "___libc_Back_fsDirChangeRoot" @285

trunk/libc/src/libos2/Makefile.kmk

@@ -2 +2 @@
 ## @file
 #
-# kBuild Sub-Makefile for kLIBC - src/libos2.
+# kBuild Sub-Makefile for kLIBC - src/libos2 - The OS/2 import and thunker libraries.
 #
 # Copyright (c) 2006 knut st. osmundsen <bird@anduin.net>
@@ -43 +43 @@
 $(call LIBC_CONFIG_VARIANT_LIBS_OTHERS,libos2)
 
+#
+# Lazy libs.
+#
+TEMPLATE_libos2lazy = libos2 lazy import template.
+TEMPLATE_libos2lazy_EXTENDS = libc
+TEMPLATE_libos2lazy_TOOL = libos2lazyimp
+TEMPLATE_libos2lazy_TOOL.os2 = libos2lazyimp
+
+TOOL_libos2lazyimp = libos2 ad hoc lazy import tool
+TOOL_libos2lazyimp_ARLIBSUFF = .a
+TOOL_libos2lazyimp_LINK_LIBRARY_OUTPUT =
+TOOL_libos2lazyimp_LINK_LIBRARY_DEPEND = $(othersrc)
+TOOL_libos2lazyimp_LINK_LIBRARY_DEPORD =
+define TOOL_libos2lazyimp_LINK_LIBRARY_CMDS
+        emximp -l -l -o $(out) $(othersrc)
+endef
+
+LIBRARIES += libos2_unicode_lazy
+libos2_unicode_lazy_TEMPLATE = libos2lazy
+libos2_unicode_lazy_SOURCES = $(PATH_LIBC_SRC)/libos2/unicode.imp
+
+LIBRARIES += libos2_pmwin_lazy
+libos2_pmwin_lazy_TEMPLATE = libos2lazy
+libos2_pmwin_lazy_SOURCES = $(PATH_LIBC_SRC)/libos2/win.imp
+
+LIBRARIES += libos2_pmwp_lazy
+libos2_pmwp_lazy_TEMPLATE = libos2lazy
+libos2_pmwp_lazy_SOURCES = $(PATH_LIBC_SRC)/libos2/wp.imp
+
+LIBRARIES += libos2_pmspl_lazy
+libos2_pmspl_lazy_TEMPLATE = libos2lazy
+libos2_pmspl_lazy_SOURCES = $(PATH_LIBC_SRC)/libos2/spl.imp
+
+LIBRARIES += libos2_som_lazy
+libos2_som_lazy_TEMPLATE = libos2lazy
+libos2_som_lazy_SOURCES = $(PATH_LIBC_SRC)/libos2/som.imp
+
+LIBRARIES += libos2_pmshapi_lazy
+libos2_pmshapi_lazy_TEMPLATE = libos2lazy
+libos2_pmshapi_lazy_SOURCES = $(PATH_LIBC_SRC)/libos2/shl.imp
+
+LIBRARIES += libos2_rexx_lazy
+libos2_rexx_lazy_TEMPLATE = libos2lazy
+libos2_rexx_lazy_SOURCES = $(PATH_LIBC_SRC)/libos2/rexx.imp
+
+LIBRARIES += libos2_rexxapi_lazy
+libos2_rexxapi_lazy_TEMPLATE = libos2lazy
+libos2_rexxapi_lazy_SOURCES = $(PATH_LIBC_SRC)/libos2/rexxapi.imp
+
+LIBRARIES += libos2_pmpic_lazy
+libos2_pmpic_lazy_TEMPLATE = libos2lazy
+libos2_pmpic_lazy_SOURCES = $(PATH_LIBC_SRC)/libos2/pic.imp
+
+LIBRARIES += libos2_helpmgr_lazy
+libos2_helpmgr_lazy_TEMPLATE = libos2lazy
+libos2_helpmgr_lazy_SOURCES = $(PATH_LIBC_SRC)/libos2/help.imp
+
+LIBRARIES += libos2_pmgpi_lazy
+libos2_pmgpi_lazy_TEMPLATE = libos2lazy
+libos2_pmgpi_lazy_SOURCES = $(PATH_LIBC_SRC)/libos2/gpi.imp
+
+LIBRARIES += libos2_pmdrag_lazy
+libos2_pmdrag_lazy_TEMPLATE = libos2lazy
+libos2_pmdrag_lazy_SOURCES = $(PATH_LIBC_SRC)/libos2/drag.imp
+
+LIBRARIES += libos2_pmctls_lazy
+libos2_pmctls_lazy_TEMPLATE = libos2lazy
+libos2_pmctls_lazy_SOURCES = $(PATH_LIBC_SRC)/libos2/ctls.imp
+
+LIBRARIES += libos2_pm_lazy
+libos2_pm_lazy_TEMPLATE = libos2lazy
+libos2_pm_lazy_SOURCES = \
+        $(PATH_LIBC_SRC)/libos2/win.imp \
+        $(PATH_LIBC_SRC)/libos2/wp.imp \
+        $(PATH_LIBC_SRC)/libos2/spl.imp \
+        $(PATH_LIBC_SRC)/libos2/shl.imp \
+        $(PATH_LIBC_SRC)/libos2/pic.imp \
+        $(PATH_LIBC_SRC)/libos2/help.imp \
+        $(PATH_LIBC_SRC)/libos2/gpi.imp \
+        $(PATH_LIBC_SRC)/libos2/drag.imp \
+        $(PATH_LIBC_SRC)/libos2/ctls.imp
+
+LIBRARIES += libos2_dos_lazy
+libos2_dos_lazy_TEMPLATE = libos2lazy
+libos2_dos_lazy_SOURCES = \
+        $(PATH_LIBC_SRC)/libos2/dos.imp \
+        $(PATH_LIBC_SRC)/libos2/ses.imp \
+        $(PATH_LIBC_SRC)/libos2/que.imp \
+        $(PATH_LIBC_SRC)/libos2/nls.imp \
+        $(PATH_LIBC_SRC)/libos2/msg.imp
+
+LIBRARIES += libos2_lazy
+libos2_lazy_TEMPLATE = libos2lazy
+libos2_lazy_SOURCES = \
+        $(filter-out %-data.imp,$(wildcard $(PATH_LIBC_SRC)/libos2/*.imp))
+
+
 # generate rules
 include $(PATH_KBUILD)/subfooter.kmk