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
@@ -49,4 +49,7 @@ $(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; )
@@ -57,2 +60,7 @@ $(OPIEDIR)/stamp-headers :
         ( 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 \
diff --git a/config.in b/config.in
index 97e1e80..7736ef2 100644
--- a/config.in
+++ b/config.in
@@ -150 +150,6 @@ menu "Tools"
 endmenu
+comment ""
+menu "Experimental"
+  source libopie2/config.in
+endmenu
+
diff --git a/packages b/packages
index ddaba2d..1b89651 100644
--- a/packages
+++ b/packages
@@ -79,2 +79,8 @@ CONFIG_LIBMPEG3	core/multimedia/opieplayer/libmpeg3	libmpeg3.pro
         CONFIG_LIBOPIE  libopielibopie.pro
+        CONFIG_LIBOPIE2CORE     libopie2/opiecoreopiecore.pro
+        CONFIG_LIBOPIE2DB       libopie2/opiedbopiedb.pro
+        CONFIG_LIBOPIE2NET      libopie2/opienetopienet.pro
+        CONFIG_LIBOPIE2PIM      libopie2/opiepimopiepim.pro
+        CONFIG_LIBOPIE2UI       libopie2/opieuiopieui.pro
+        CONFIG_LIBOPIE2EXAMPLES         libopie2/examplesexamples.pro
         CONFIG_LIBQPE   librarylibrary.pro