Making opie compile again.

1 files changed, 36 insertions, 11 deletions

diff --git a/core/launcher/Makefile.in b/core/launcher/Makefile.in
index 5e2dbe5..91a5a9b 100644
--- a/core/launcher/Makefile.in
+++ b/core/launcher/Makefile.in
@@ -22,12 +22,13 @@ TARGET	= qpe
 TARGET1 = lib$(TARGET).so.$(VER_MAJ)
 
 ####### Files
 
         HEADERS =background.h \
                 desktop.h \
+                qprocess.h \
                 info.h \
                 appicons.h \
                 taskbar.h \
                 sidething.h \
                 mrulist.h \
                 stabmon.h \
@@ -60,12 +61,14 @@ HEADERS =	background.h \
                 $(OPIEDIR)/rsync/util.h \
                 $(OPIEDIR)/rsync/whole.h \
                 $(OPIEDIR)/rsync/config_rsync.h \
                 $(OPIEDIR)/rsync/qrsync.h
         SOURCES =background.cpp \
                 desktop.cpp \
+                qprocess.cpp \
+                qprocess_unix.cpp \
                 info.cpp \
                 appicons.cpp \
                 taskbar.cpp \
                 sidething.cpp \
                 mrulist.cpp \
                 stabmon.cpp \
@@ -107,12 +110,14 @@ SOURCES =	background.cpp \
                 $(OPIEDIR)/rsync/util.c \
                 $(OPIEDIR)/rsync/version.c \
                 $(OPIEDIR)/rsync/whole.c \
                 $(OPIEDIR)/rsync/qrsync.cpp
         OBJECTS =background.o \
                 desktop.o \
+                qprocess.o \
+                qprocess_unix.o \
                 info.o \
                 appicons.o \
                 taskbar.o \
                 sidething.o \
                 mrulist.o \
                 stabmon.o \
@@ -162,12 +167,13 @@ INTERFACES =    shutdown.ui \
 UICDECLS =      shutdown.h \
                 syncdialog.h
 UICIMPLS =      shutdown.cpp \
                 syncdialog.cpp
         SRCMOC  =moc_background.cpp \
                 moc_desktop.cpp \
+                moc_qprocess.cpp \
                 moc_info.cpp \
                 moc_appicons.cpp \
                 moc_taskbar.cpp \
                 moc_sidething.cpp \
                 moc_inputmethods.cpp \
                 moc_systray.cpp \
@@ -177,17 +183,19 @@ SRCMOC	=	moc_background.cpp \
                 ../calibrate/moc_calibrate.cpp \
                 moc_startmenu.cpp \
                 moc_transferserver.cpp \
                 moc_qcopbridge.cpp \
                 moc_packageslave.cpp \
                 moc_irserver.cpp \
+                qprocess_unix.moc \
                 appicons.moc \
                 moc_shutdown.cpp \
                 moc_syncdialog.cpp
         OBJMOC  =moc_background.o \
                 moc_desktop.o \
+                moc_qprocess.o \
                 moc_info.o \
                 moc_appicons.o \
                 moc_taskbar.o \
                 moc_sidething.o \
                 moc_inputmethods.o \
                 moc_systray.o \
@@ -287,23 +295,30 @@ desktop.o: desktop.cpp \
                 $(OPIEDIR)/include/qpe/storage.h \
                 mrulist.h \
                 $(OPIEDIR)/include/qpe/applnk.h \
                 qcopbridge.h \
                 startmenu.h \
                 taskbar.h \
-                $(OPIEDIR)/include/qpe/custom.h \
                 transferserver.h \
                 irserver.h \
                 packageslave.h \
                 $(OPIEDIR)/include/qpe/mimetype.h \
                 $(OPIEDIR)/include/qpe/password.h \
                 $(OPIEDIR)/include/qpe/config.h \
                 $(OPIEDIR)/include/qpe/power.h \
                 $(OPIEDIR)/include/qpe/qcopenvelope_qws.h \
                 $(OPIEDIR)/include/qpe/global.h
 
+qprocess.o: qprocess.cpp \
+                qprocess.h
+
+qprocess_unix.o: qprocess_unix.cpp \
+                qprocess_unix.moc \
+                qprocess.h \
+                qcleanuphandler_p.h
+
 info.o: info.cpp \
                 info.h \
                 background.h \
                 desktop.h \
                 shutdownimpl.h \
                 shutdown.h \
@@ -328,13 +343,12 @@ taskbar.o: taskbar.cpp \
                 $(OPIEDIR)/include/qpe/taskbarappletinterface.h \
                 $(OPIEDIR)/calibrate/calibrate.h \
                 wait.h \
                 $(OPIEDIR)/include/qpe/resource.h \
                 appicons.h \
                 taskbar.h \
-                $(OPIEDIR)/include/qpe/custom.h \
                 desktop.h \
                 shutdownimpl.h \
                 shutdown.h \
                 $(OPIEDIR)/include/qpe/qpeapplication.h \
                 $(OPIEDIR)/include/qpe/qcopenvelope_qws.h \
                 $(OPIEDIR)/include/qpe/global.h \
@@ -362,13 +376,15 @@ taskbar.o: taskbar.cpp \
                 ../solitaire/canvascardwindow.h \
                 ../snake/interface.h \
                 ../parashoot/interface.h \
                 $(OPIEDIR)/include/qpe/sound.h \
                 ../mpegplayer/mediaplayer.h \
                 $(OPIEDIR)/include/qpe/qlibrary.h \
+                $(OPIEDIR)/include/qpe/mediaplayerplugininterface.h \
                 ../embeddedkonsole/konsole.h \
+                $(OPIEDIR)/include/qpe/qpetoolbar.h \
                 ../wordgame/wordgame.h \
                 $(OPIEDIR)/include/qpe/qdawg.h
 
 sidething.o: sidething.cpp \
                 sidething.h \
                 startmenu.h \
@@ -446,17 +462,17 @@ launcherview.o: launcherview.cpp \
 
 $(OPIEDIR)/calibrate/calibrate.o: $(OPIEDIR)/calibrate/calibrate.cpp \
                 $(OPIEDIR)/calibrate/calibrate.h \
                 $(OPIEDIR)/include/qpe/resource.h
 
 transferserver.o: transferserver.cpp \
-                $(OPIEDIR)/include/qpe/qprocess.h \
                 $(OPIEDIR)/include/qpe/process.h \
                 $(OPIEDIR)/include/qpe/config.h \
                 $(OPIEDIR)/include/qpe/qcopenvelope_qws.h \
-                transferserver.h
+                transferserver.h \
+                qprocess.h
 
 packageslave.o: packageslave.cpp \
                 packageslave.h \
                 $(OPIEDIR)/include/qpe/process.h \
                 $(OPIEDIR)/include/qpe/qcopenvelope_qws.h
 
@@ -489,13 +505,12 @@ startmenu.o: startmenu.cpp \
 main.o: main.cpp \
                 desktop.h \
                 shutdownimpl.h \
                 shutdown.h \
                 $(OPIEDIR)/include/qpe/qpeapplication.h \
                 taskbar.h \
-                $(OPIEDIR)/include/qpe/custom.h \
                 stabmon.h \
                 $(OPIEDIR)/include/qpe/network.h \
                 $(OPIEDIR)/include/qpe/config.h \
                 $(OPIEDIR)/include/qpe/qcopenvelope_qws.h \
                 $(OPIEDIR)/include/qpe/alarmserver.h \
                 ../calibrate/calibrate.h \
@@ -744,22 +759,24 @@ moc_background.o: moc_background.cpp \
 moc_desktop.o: moc_desktop.cpp \
                 desktop.h \
                 shutdownimpl.h \
                 shutdown.h \
                 $(OPIEDIR)/include/qpe/qpeapplication.h
 
+moc_qprocess.o: moc_qprocess.cpp \
+                qprocess.h
+
 moc_info.o: moc_info.cpp \
                 info.h \
                 background.h
 
 moc_appicons.o: moc_appicons.cpp \
                 appicons.h
 
 moc_taskbar.o: moc_taskbar.cpp \
-                taskbar.h \
-                $(OPIEDIR)/include/qpe/custom.h
+                taskbar.h
 
 moc_sidething.o: moc_sidething.cpp \
                 sidething.h \
                 startmenu.h
 
 moc_inputmethods.o: moc_inputmethods.cpp \
@@ -802,26 +819,31 @@ moc_qcopbridge.o: moc_qcopbridge.cpp \
 moc_packageslave.o: moc_packageslave.cpp \
                 packageslave.h
 
 moc_irserver.o: moc_irserver.cpp \
                 irserver.h
 
-moc_shutdown.o: appicons.moc \
+moc_shutdown.o: qprocess_unix.moc \
+                qprocess_unix.cpp \
+                qprocess.h \
+                qcleanuphandler_p.h
+
+moc_syncdialog.o: appicons.moc \
                 appicons.cpp \
                 appicons.h \
                 $(OPIEDIR)/include/qpe/qcopenvelope_qws.h
 
-moc_syncdialog.o: moc_shutdown.cpp \
-                shutdown.h
-
 moc_background.cpp: background.h
         $(MOC) background.h -o moc_background.cpp
 
 moc_desktop.cpp: desktop.h
         $(MOC) desktop.h -o moc_desktop.cpp
 
+moc_qprocess.cpp: qprocess.h
+        $(MOC) qprocess.h -o moc_qprocess.cpp
+
 moc_info.cpp: info.h
         $(MOC) info.h -o moc_info.cpp
 
 moc_appicons.cpp: appicons.h
         $(MOC) appicons.h -o moc_appicons.cpp
 
@@ -861,12 +883,15 @@ moc_qcopbridge.cpp: qcopbridge.h
 moc_packageslave.cpp: packageslave.h
         $(MOC) packageslave.h -o moc_packageslave.cpp
 
 moc_irserver.cpp: irserver.h
         $(MOC) irserver.h -o moc_irserver.cpp
 
+qprocess_unix.moc: qprocess_unix.cpp
+        $(MOC) qprocess_unix.cpp -o qprocess_unix.moc
+
 appicons.moc: appicons.cpp
         $(MOC) appicons.cpp -o appicons.moc
 
 moc_shutdown.cpp: shutdown.h
         $(MOC) shutdown.h -o moc_shutdown.cpp