From b2b8943d50adceb5397f64a8cc97ccd396d16c57 Mon Sep 17 00:00:00 2001
From: Ingo Weinhold <ingo_weinhold@gmx.de>
Date: Wed, 6 Feb 2008 13:22:14 +0000
Subject: [PATCH] Beginnings of an optional "Development" package. Currently
 only the glue code and the library symlinks are installed.

git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@23895 a95241bf-73f2-0310-859d-f6bbb57e9c96
---
 build/jam/HaikuImage | 35 +++++++++++++++++++++++++++--------
 1 file changed, 27 insertions(+), 8 deletions(-)

diff --git a/build/jam/HaikuImage b/build/jam/HaikuImage
index 9d5146efbf..0f7b45dd39 100644
--- a/build/jam/HaikuImage
+++ b/build/jam/HaikuImage
@@ -61,7 +61,7 @@ BEOS_DEMOS = BitmapDrawing BSnow Chart Clock $(X86_ONLY)Cortex FontDemo
 	$(X86_ONLY)GLDirectMode $(X86_ONLY)GLTeapot Mandelbrot PictureTest
 	Playground Pulse Sudoku
 ;
-BEOS_SYSTEM_LIB = libbe.so $(HAIKU_LIBSTDC++) libmedia.so libtracker.so
+BEOS_SYSTEM_LIBS = libbe.so $(HAIKU_LIBSTDC++) libmedia.so libtracker.so
 	libtranslation.so libnetwork.so libdebug.so libbsd.so libmail.so
 	libtextencoding.so libz.so libfreetype.so libpng.so libmidi.so libmidi2.so
 	libdevice.so libgame.so libscreensaver.so <revisioned>libroot.so
@@ -176,14 +176,18 @@ AddDriversToHaikuImage net			: $(BEOS_ADD_ONS_DRIVERS_NET) ;
 AddFilesToHaikuImage beos system : <revisioned>kernel_$(TARGET_ARCH) ;
 
 # libs
-AddFilesToHaikuImage beos system lib : $(BEOS_SYSTEM_LIB) ;
+AddFilesToHaikuImage beos system lib : $(BEOS_SYSTEM_LIBS) ;
+
 # libnetwork.so replaces quite a few libraries
-AddSymlinkToHaikuImage beos system lib : libnetwork.so : libsocket.so ;
-AddSymlinkToHaikuImage beos system lib : libnetwork.so : libbind.so ;
-AddSymlinkToHaikuImage beos system lib : libnetwork.so : libnet.so ;
-AddSymlinkToHaikuImage beos system lib : libnetwork.so : libnetapi.so ;
-AddSymlinkToHaikuImage beos system lib : libnetwork.so : libbnetapi.so ;
-# libGL.so have GLUT built-in
+BEOS_SYSTEM_LIBS_LIBNETWORK_ALIASES
+	= libsocket.so libbind.so libnet.so libnetapi.so libbnetapi.so ;
+
+local lib ;
+for lib in $(BEOS_SYSTEM_LIBS_LIBNETWORK_ALIASES) {
+	AddSymlinkToHaikuImage beos system lib : libnetwork.so : $(lib) ;
+}
+
+# libGL.so has GLUT built-in
 if $(TARGET_ARCH) = x86 {
 	AddSymlinkToHaikuImage beos system lib : $(X86_ONLY)libGL.so : libglut.so ;
 }
@@ -473,6 +477,21 @@ if $(HAIKU_ADD_POSIX_TEST_SUITE_TO_IMAGE) {
 #pragma mark - Optional Packages
 
 
+# Development
+if [ IsOptionalHaikuImagePackageAdded Development ]
+		&& $(TARGET_ARCH) = x86 {
+	# glue code
+	AddFilesToHaikuImage develop lib x86
+		: <src!system!glue!arch!x86>crti.o <src!system!glue!arch!x86>crtn.o
+		  <src!system!glue>init_term_dyn.o <src!system!glue>start_dyn.o ;
+
+	# library symlinks
+	local lib ;
+	for lib in $(BEOS_SYSTEM_LIBS) $(BEOS_SYSTEM_LIBS_LIBNETWORK_ALIASES) {
+		AddSymlinkToHaikuImage develop lib x86 : /system/lib/$(lib:BS) ;
+	}
+}
+
 # Vision
 if [ IsOptionalHaikuImagePackageAdded Vision ] {
 	InstallOptionalHaikuImagePackage Vision