summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--Rules.make12
-rw-r--r--config.in5
-rw-r--r--packages6
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
@@ -47,14 +47,22 @@ $(QTDIR)/stamp-headers-x11 :
47 47
48$(OPIEDIR)/stamp-headers : 48$(OPIEDIR)/stamp-headers :
49 @-rm -f $(OPIEDIR)/stamp-headers* 49 @-rm -f $(OPIEDIR)/stamp-headers*
50 mkdir -p $(TOPDIR)/include/qpe $(TOPDIR)/include/qtopia \ 50 mkdir -p $(TOPDIR)/include/qpe \
51 $(TOPDIR)/include/opie $(TOPDIR)/include/qtopia/private 51 $(TOPDIR)/include/qtopia \
52 $(TOPDIR)/include/opie \
53 $(TOPDIR)/include/qtopia/private \
54 $(TOPDIR)/include/opie2
52 ( cd include/qpe && rm -f *.h; ln -sf ../../library/*.h .; ln -sf ../../library/backend/*.h .; rm -f *_p.h; ) 55 ( cd include/qpe && rm -f *.h; ln -sf ../../library/*.h .; ln -sf ../../library/backend/*.h .; rm -f *_p.h; )
53 ( cd include/qtopia && rm -f *.h; ln -sf ../../library/*.h .; ) 56 ( cd include/qtopia && rm -f *.h; ln -sf ../../library/*.h .; )
54 ( cd include/qtopia/private && rm -f *.h; ln -sf ../../../library/backend/*.h .; ) 57 ( cd include/qtopia/private && rm -f *.h; ln -sf ../../../library/backend/*.h .; )
55 ( cd include/opie && rm -f *.h; ln -sf ../../libopie/*.h .; rm -f *_p.h; ) 58 ( cd include/opie && rm -f *.h; ln -sf ../../libopie/*.h .; rm -f *_p.h; )
56 ( cd include/opie && ln -sf ../../libsql/*.h .; ) 59 ( cd include/opie && ln -sf ../../libsql/*.h .; )
57 ( cd include/opie && ln -sf ../../libopie/pim/*.h .; ) 60 ( cd include/opie && ln -sf ../../libopie/pim/*.h .; )
61 ( cd include/opie2 && ln -sf ../../libopie2/opiecore/*.h .; )
62 #( cd include/opie2 && ln -sf ../../libopie2/opiedb/*.h .; )
63 ( cd include/opie2 && ln -sf ../../libopie2/opienet/*.h .; )
64 #( cd include/opie2 && ln -sf ../../libopie2/opiepim/*.h .; )
65 ( cd include/opie2 && ln -sf ../../libopie2/opieui/*.h .; )
58 ( cd include/opie; for generatedHeader in `cd ../../libopie; ls *.ui | sed -e "s,\.ui,\.h,g"`; do \ 66 ( cd include/opie; for generatedHeader in `cd ../../libopie; ls *.ui | sed -e "s,\.ui,\.h,g"`; do \
59 ln -sf ../../libopie/$$generatedHeader $$generatedHeader; done ) 67 ln -sf ../../libopie/$$generatedHeader $$generatedHeader; done )
60 ln -sf ../../library/custom.h $(TOPDIR)/include/qpe/custom.h 68 ln -sf ../../library/custom.h $(TOPDIR)/include/qpe/custom.h
diff --git a/config.in b/config.in
index 97e1e80..7736ef2 100644
--- a/config.in
+++ b/config.in
@@ -148,3 +148,8 @@ menu "Tools"
148 source noncore/tools/config.in 148 source noncore/tools/config.in
149 source development/config.in 149 source development/config.in
150endmenu 150endmenu
151comment ""
152menu "Experimental"
153 source libopie2/config.in
154endmenu
155
diff --git a/packages b/packages
index ddaba2d..1b89651 100644
--- a/packages
+++ b/packages
@@ -77,6 +77,12 @@ CONFIG_LIBMAD core/multimedia/opieplayer/libmad libmad.pro
77 CONFIG_LIBMAIL noncore/mail/libmaillibmail.pro 77 CONFIG_LIBMAIL noncore/mail/libmaillibmail.pro
78 CONFIG_LIBMPEG3 core/multimedia/opieplayer/libmpeg3libmpeg3.pro 78 CONFIG_LIBMPEG3 core/multimedia/opieplayer/libmpeg3libmpeg3.pro
79 CONFIG_LIBOPIE libopielibopie.pro 79 CONFIG_LIBOPIE libopielibopie.pro
80 CONFIG_LIBOPIE2CORE libopie2/opiecoreopiecore.pro
81 CONFIG_LIBOPIE2DB libopie2/opiedbopiedb.pro
82 CONFIG_LIBOPIE2NET libopie2/opienetopienet.pro
83 CONFIG_LIBOPIE2PIM libopie2/opiepimopiepim.pro
84 CONFIG_LIBOPIE2UI libopie2/opieuiopieui.pro
85 CONFIG_LIBOPIE2EXAMPLES libopie2/examplesexamples.pro
80 CONFIG_LIBQPE librarylibrary.pro 86 CONFIG_LIBQPE librarylibrary.pro
81 CONFIG_LIBQPE-X11 x11/libqpe-x11libqpe-x11.pro 87 CONFIG_LIBQPE-X11 x11/libqpe-x11libqpe-x11.pro
82 CONFIG_LIGHT-AND-POWER core/settings/light-and-powerlight-and-power.pro 88 CONFIG_LIGHT-AND-POWER core/settings/light-and-powerlight-and-power.pro