enable building libopie2 under menu "experimental" -

don't forget to remove stamp-headers and remake them to automatically
add the various $(OPIEDIR)/include/opie2 headers.

3 files changed, 21 insertions, 2 deletions

diff --git a/Rules.make b/Rules.make
index 16c6455..a707751 100644
--- a/Rules.make
+++ b/Rules.make
@@ -42,24 +42,32 @@ $(QTDIR)/stamp-headers :
 
 $(QTDIR)/stamp-headers-x11 :
 	@-rm -f $(QTDIR)/stamp-headers*
 	cd $(QTDIR)/include; $(patsubst %,ln -sf $(OPIEDIR)/x11/libqpe-x11/qt/%;,qgfx_qws.h qwsmouse_qws.h qcopchannel_qws.h qwindowsystem_qws.h qfontmanager_qws.h qwsdefaultdecoration_qws.h)
 	touch $@
 
 $(OPIEDIR)/stamp-headers :
 	@-rm -f $(OPIEDIR)/stamp-headers*
-	mkdir -p $(TOPDIR)/include/qpe $(TOPDIR)/include/qtopia \
-		$(TOPDIR)/include/opie $(TOPDIR)/include/qtopia/private
+	mkdir -p $(TOPDIR)/include/qpe \
+                 $(TOPDIR)/include/qtopia \
+		 $(TOPDIR)/include/opie \
+                 $(TOPDIR)/include/qtopia/private \
+                 $(TOPDIR)/include/opie2
 	( cd include/qpe &&  rm -f *.h; ln -sf ../../library/*.h .; ln -sf ../../library/backend/*.h .; rm -f *_p.h; )
 	( cd include/qtopia && rm -f *.h; ln -sf ../../library/*.h .; )
 	( cd include/qtopia/private && rm -f *.h; ln -sf ../../../library/backend/*.h .; )
 	( cd include/opie &&  rm -f *.h; ln -sf ../../libopie/*.h .; rm -f *_p.h; )
 	( cd include/opie &&  ln -sf ../../libsql/*.h .; )
 	( cd include/opie &&  ln -sf ../../libopie/pim/*.h .; )
+	( cd include/opie2 && ln -sf ../../libopie2/opiecore/*.h .; )
+	#( cd include/opie2 && ln -sf ../../libopie2/opiedb/*.h .; )
+	( cd include/opie2 && ln -sf ../../libopie2/opienet/*.h .; )
+	#( cd include/opie2 && ln -sf ../../libopie2/opiepim/*.h .; )
+	( cd include/opie2 && ln -sf ../../libopie2/opieui/*.h .; )
 	( cd include/opie; for generatedHeader in `cd ../../libopie; ls *.ui | sed -e "s,\.ui,\.h,g"`; do \
 	ln -sf ../../libopie/$$generatedHeader $$generatedHeader; done )
 	ln -sf ../../library/custom.h $(TOPDIR)/include/qpe/custom.h
 	touch $@
 	
 $(OPIEDIR)/stamp-headers-x11 :
 	@-rm -f $(OPIEDIR)/stamp-headers*
 	mkdir -p $(TOPDIR)/include/qpe $(TOPDIR)/include/qtopia \
diff --git a/config.in b/config.in
index 97e1e80..7736ef2 100644
--- a/config.in
+++ b/config.in
@@ -143,8 +143,13 @@ endmenu
 menu "Theming"
   source noncore/decorations/config.in
   source noncore/styles/config.in
 endmenu
 menu "Tools"
   source noncore/tools/config.in
   source development/config.in
 endmenu
+comment ""
+menu "Experimental"
+  source libopie2/config.in
+endmenu
+
diff --git a/packages b/packages
index ddaba2d..1b89651 100644
--- a/packages
+++ b/packages
@@ -72,16 +72,22 @@ CONFIG_LANGUAGE	noncore/settings/language	language.pro
 CONFIG_LAUNCHER-SETTINGS	core/settings/launcher	launcher.pro
 CONFIG_LAUNCHER_CORE	core/launcher	launcher.pro
 CONFIG_LIBOPIETOOTH	noncore/net/opietooth/lib	lib.pro
 CONFIG_LIBKATE  noncore/apps/tinykate/libkate libkate.pro
 CONFIG_LIBMAD	core/multimedia/opieplayer/libmad	libmad.pro
 CONFIG_LIBMAIL	noncore/mail/libmail	libmail.pro
 CONFIG_LIBMPEG3	core/multimedia/opieplayer/libmpeg3	libmpeg3.pro
 CONFIG_LIBOPIE	libopie	libopie.pro
+CONFIG_LIBOPIE2CORE	libopie2/opiecore	opiecore.pro
+CONFIG_LIBOPIE2DB	libopie2/opiedb	opiedb.pro
+CONFIG_LIBOPIE2NET	libopie2/opienet	opienet.pro
+CONFIG_LIBOPIE2PIM	libopie2/opiepim	opiepim.pro
+CONFIG_LIBOPIE2UI	libopie2/opieui	opieui.pro
+CONFIG_LIBOPIE2EXAMPLES	libopie2/examples	examples.pro
 CONFIG_LIBQPE	library	library.pro
 CONFIG_LIBQPE-X11	x11/libqpe-x11	libqpe-x11.pro
 CONFIG_LIGHT-AND-POWER	core/settings/light-and-power	light-and-power.pro
 CONFIG_LIQUID	noncore/styles/liquid	liquid.pro
 CONFIG_LOGOUTAPPLET	core/applets/logoutapplet	logoutapplet.pro
 CONFIG_OPIETOOTH-MANAGER	noncore/net/opietooth/manager	manager.pro
 CONFIG_MEDIUMMOUNT	noncore/settings/mediummount	mediummount.pro
 CONFIG_METAL	noncore/styles/metal	metal.pro