add memoryapplet to build system

3 files changed, 34 insertions, 2 deletions

diff --git a/Rules.make b/Rules.make
index a1e6f09..86543bb 100644
--- a/Rules.make
+++ b/Rules.make
@@ -15,13 +15,13 @@ else
 endif
 ifeq ($(filter 3.%,$(QTE_VERSION)),) # not qt3
 	echo CONFIG -= qt3 >> $@
 else
 	echo CONFIG += qt3 >> $@
 endif
-ifeq ($(CONFIG_QUICK_LAUNCH),)
+ifneq ($(CONFIG_QUICK_LAUNCH),)
 	echo contains\( CONFIG, quick-app \) \{ >> $@
 	echo CONFIG -= quick-app >> $@
 	echo CONFIG += quick-app-lib >> $@
 	echo \} >> $@
 else
 	echo contains\( CONFIG, quick-app \) \{ >> $@
diff --git a/noncore/applets/memoryapplet/memoryapplet.pro b/noncore/applets/memoryapplet/memoryapplet.pro
new file mode 100644
index 0000000..eafabce
--- a/dev/null
+++ b/noncore/applets/memoryapplet/memoryapplet.pro
@@ -0,0 +1,24 @@
+TEMPLATE    = lib
+CONFIG      += qt plugin warn_on release
+HEADERS     = ../../apps/sysinfo/graph.h \
+            ../../apps/sysinfo/load.h  \
+            ../../apps/sysinfo/memory.h  \
+            memoryappletimpl.h  \
+            memorymeter.h  \
+            memorystatus.h \
+            swapfile.h
+SOURCES     = ../../apps/sysinfo/graph.cpp \
+            ../../apps/sysinfo/load.cpp \
+            ../../apps/sysinfo/memory.cpp \
+            memoryappletimpl.cpp  \
+            memorymeter.cpp \
+            memorystatus.cpp \
+            swapfile.cpp
+TARGET      = memoryapplet
+DESTDIR     = $(OPIEDIR)/plugins/applets
+INCLUDEPATH += $(OPIEDIR)/include
+DEPENDPATH  += ../$(OPIEDIR)/include
+VERSION     = 1.0.0
+LIBS        += -lqpe -lopie
+
+include ( $(OPIEDIR)/include.pro )
diff --git a/packages b/packages
index 7fac4f0..c48eee8 100644
--- a/packages
+++ b/packages
@@ -81,12 +81,13 @@ CONFIG_LIBTREMOR core/multimedia/opieplayer/vorbis/tremor tremor.pro
 CONFIG_LIBTREMORPLUGIN core/multimedia/opieplayer/vorbis libtremor.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_MAILIT		noncore/net/mailit		mailit.pro
 CONFIG_MEDIUMMOUNT	noncore/settings/mediummount	mediummount.pro
+CONFIG_MEMORYAPPLET	noncore/applets/memoryapplet	memoryapplet.pro
 CONFIG_METAL	noncore/styles/metal	metal.pro
 CONFIG_MINDBREAKER	noncore/games/mindbreaker	mindbreaker.pro
 CONFIG_MINESWEEP	noncore/games/minesweep	minesweep.pro
 CONFIG_MOBILEMSG	noncore/comm/mobilemsg	mobilemsg.pro
 CONFIG_MODPLUG	core/multimedia/opieplayer/modplug	modplug.pro
 CONFIG_MULTIKEY	inputmethods/multikey	multikey.pro
@@ -118,13 +119,14 @@ CONFIG_OSEARCH	core/pim/osearch	osearch.pro
 CONFIG_OXYGEN	noncore/apps/oxygen	oxygen.pro
 CONFIG_PARASHOOT	noncore/games/parashoot	parashoot.pro
 CONFIG_PICKBOARD	inputmethods/pickboard	pickboard.pro
 CONFIG_QASTEROIDS	noncore/games/qasteroids	qasteroids.pro
 CONFIG_QCOP	core/apps/qcop	qcop.pro
 CONFIG_QPDF	noncore/graphics/qpdf	qpdf.pro
-CONFIG_QUICKEXEC	quickexec	quickexec.pro
+CONFIG_QPDF2	noncore/graphics/qpdf2	qpdf2.pro
+CONFIG_QUICKLAUNCHER core/tools/quicklauncher quicklauncher.pro
 CONFIG_QWS	core/qws	qws.pro
 CONFIG_REMOTE	noncore/tools/remote	remote.pro
 CONFIG_RESTARTAPPLET	core/applets/restartapplet	restartapplet.pro
 CONFIG_RESTARTAPPLET2	core/applets/restartapplet2	restartapplet2.pro
 CONFIG_ROTATEAPPLET	core/applets/rotateapplet	rotateapplet.pro
 CONFIG_ROTATION	noncore/settings/rotation	rotation.pro
@@ -176,8 +178,14 @@ CONFIG_PPP	noncore/settings/networksettings/ppp	ppp.pro
 CONFIG_WORDGAME	noncore/games/wordgame	wordgame.pro
 CONFIG_ZSAFE	noncore/apps/zsafe zsafe.pro
 CONFIG_MAIN_TAB_EXAMPLE	examples/main-tab	example.pro
 CONFIG_SIMPLE_EXAMPLE	examples/simple	example.pro
 CONFIG_SIMPLE_ICON	examples/simple-icon	example.pro
 CONFIG_SIMPLE_MAIN	examples/simple-main	example.pro
+<<<<<<< packages
+CONFIG_SIMPLE_PIM	examples/simple-pim	example.pro
+CONFIG_BIGSCREEN_EXAMPLE       libopie/big-screen/example      osplitter_mail.pro
+
+=======
 CONFIG_SIMPLE_PIM	examples/simple-pim	example.pro
 CONFIG_APPLET_EXAMPLE	examples/applet	example.pro
+>>>>>>> 1.56