From 5a3c8bf8c1033882685f3a6d897c6fa5229403e3 Mon Sep 17 00:00:00 2001 From: kergoth Date: Fri, 01 Feb 2002 22:24:34 +0000 Subject: Making opie compile again. --- diff --git a/core/apps/embeddedkonsole/Makefile.in b/core/apps/embeddedkonsole/Makefile.in index 0da49d7..1c24ded 100644 --- a/core/apps/embeddedkonsole/Makefile.in +++ b/core/apps/embeddedkonsole/Makefile.in @@ -99,10 +99,8 @@ $(DESTDIR)$(TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC) $(SUBLIBS) moc: $(SRCMOC) -tmake: Makefile.in - -Makefile.in: embeddedkonsole.pro - tmake embeddedkonsole.pro -o Makefile.in +tmake: + tmake embeddedkonsole.pro clean: -rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS) @@ -185,9 +183,14 @@ session.o: session.cpp \ keytrans.o: keytrans.cpp \ keytrans.h \ + $(OPIEDIR)/include/qpe/qpeapplication.h \ default.keytab.h konsole.o: konsole.cpp \ + $(OPIEDIR)/include/qpe/resource.h \ + $(OPIEDIR)/include/qpe/qpetoolbar.h \ + $(OPIEDIR)/include/qpe/qpemenubar.h \ + $(OPIEDIR)/include/qpe/config.h \ konsole.h \ MyPty.h \ TEWidget.h \ @@ -201,6 +204,7 @@ konsole.o: konsole.cpp \ main.o: main.cpp \ konsole.h \ + $(OPIEDIR)/include/qpe/qpetoolbar.h \ MyPty.h \ TEWidget.h \ TECommon.h \ @@ -209,7 +213,8 @@ main.o: main.cpp \ TEHistory.h \ TEmulation.h \ keytrans.h \ - session.h + session.h \ + $(OPIEDIR)/include/qpe/qpeapplication.h MyPty.o: MyPty.cpp \ MyPty.h @@ -248,6 +253,7 @@ moc_session.o: moc_session.cpp \ moc_konsole.o: moc_konsole.cpp \ konsole.h \ + $(OPIEDIR)/include/qpe/qpetoolbar.h \ MyPty.h \ TEWidget.h \ TECommon.h \ 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 @@ -25,6 +25,7 @@ TARGET1 = lib$(TARGET).so.$(VER_MAJ) HEADERS = background.h \ desktop.h \ + qprocess.h \ info.h \ appicons.h \ taskbar.h \ @@ -63,6 +64,8 @@ HEADERS = background.h \ $(OPIEDIR)/rsync/qrsync.h SOURCES = background.cpp \ desktop.cpp \ + qprocess.cpp \ + qprocess_unix.cpp \ info.cpp \ appicons.cpp \ taskbar.cpp \ @@ -110,6 +113,8 @@ SOURCES = background.cpp \ $(OPIEDIR)/rsync/qrsync.cpp OBJECTS = background.o \ desktop.o \ + qprocess.o \ + qprocess_unix.o \ info.o \ appicons.o \ taskbar.o \ @@ -165,6 +170,7 @@ UICIMPLS = shutdown.cpp \ syncdialog.cpp SRCMOC = moc_background.cpp \ moc_desktop.cpp \ + moc_qprocess.cpp \ moc_info.cpp \ moc_appicons.cpp \ moc_taskbar.cpp \ @@ -180,11 +186,13 @@ SRCMOC = moc_background.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 \ @@ -290,7 +298,6 @@ desktop.o: desktop.cpp \ qcopbridge.h \ startmenu.h \ taskbar.h \ - $(OPIEDIR)/include/qpe/custom.h \ transferserver.h \ irserver.h \ packageslave.h \ @@ -301,6 +308,14 @@ desktop.o: desktop.cpp \ $(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 \ @@ -331,7 +346,6 @@ taskbar.o: taskbar.cpp \ $(OPIEDIR)/include/qpe/resource.h \ appicons.h \ taskbar.h \ - $(OPIEDIR)/include/qpe/custom.h \ desktop.h \ shutdownimpl.h \ shutdown.h \ @@ -365,7 +379,9 @@ taskbar.o: taskbar.cpp \ $(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 @@ -449,11 +465,11 @@ $(OPIEDIR)/calibrate/calibrate.o: $(OPIEDIR)/calibrate/calibrate.cpp \ $(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 \ @@ -492,7 +508,6 @@ main.o: main.cpp \ 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 \ @@ -747,6 +762,9 @@ moc_desktop.o: moc_desktop.cpp \ 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 @@ -755,8 +773,7 @@ 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 \ @@ -805,20 +822,25 @@ moc_packageslave.o: moc_packageslave.cpp \ 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 @@ -864,6 +886,9 @@ moc_packageslave.cpp: packageslave.h 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 diff --git a/core/multimedia/opieplayer/Makefile.in b/core/multimedia/opieplayer/Makefile.in index 3e1f9fc..1b0307a 100644 --- a/core/multimedia/opieplayer/Makefile.in +++ b/core/multimedia/opieplayer/Makefile.in @@ -100,10 +100,8 @@ $(DESTDIR)$(TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC) $(SUBLIBS) moc: $(SRCMOC) -tmake: Makefile.in - -Makefile.in: mpegplayer.pro - tmake mpegplayer.pro -o Makefile.in +tmake: + tmake mpegplayer.pro clean: -rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS) @@ -137,57 +135,100 @@ REQUIRES= ####### Compile main.o: main.cpp \ + $(OPIEDIR)/include/qpe/qpeapplication.h \ mediaplayerstate.h \ playlistwidget.h \ + $(OPIEDIR)/include/qpe/applnk.h \ audiowidget.h \ videowidget.h \ loopcontrol.h \ - mediaplayer.h + mediaplayer.h \ + $(OPIEDIR)/include/qpe/qlibrary.h \ + $(OPIEDIR)/include/qpe/qcom.h \ + $(OPIEDIR)/include/qpe/quuid.h \ + $(OPIEDIR)/include/qpe/mediaplayerplugininterface.h loopcontrol.o: loopcontrol.cpp \ + $(OPIEDIR)/include/qpe/qpeapplication.h \ + $(OPIEDIR)/include/qpe/qcopenvelope_qws.h \ loopcontrol.h \ videowidget.h \ audiodevice.h \ + mediaplayerplugininterface.h \ + $(OPIEDIR)/include/qpe/qcom.h \ + $(OPIEDIR)/include/qpe/quuid.h \ mediaplayerstate.h playlistselection.o: playlistselection.cpp \ + $(OPIEDIR)/include/qpe/applnk.h \ + $(OPIEDIR)/include/qpe/resource.h \ playlistselection.h mediaplayerstate.o: mediaplayerstate.cpp \ + $(OPIEDIR)/include/qpe/qpeapplication.h \ + $(OPIEDIR)/include/qpe/qlibrary.h \ + $(OPIEDIR)/include/qpe/qcom.h \ + $(OPIEDIR)/include/qpe/quuid.h \ + $(OPIEDIR)/include/qpe/mediaplayerplugininterface.h \ + $(OPIEDIR)/include/qpe/config.h \ mediaplayerstate.h \ libmad/libmadpluginimpl.h \ libmpeg3/libmpeg3pluginimpl.h \ wavplugin/wavpluginimpl.h videowidget.o: videowidget.cpp \ + $(OPIEDIR)/include/qpe/resource.h \ + $(OPIEDIR)/include/qpe/mediaplayerplugininterface.h \ + $(OPIEDIR)/include/qpe/qcom.h \ + $(OPIEDIR)/include/qpe/quuid.h \ videowidget.h \ mediaplayerstate.h audiowidget.o: audiowidget.cpp \ + $(OPIEDIR)/include/qpe/resource.h \ audiowidget.h \ mediaplayerstate.h playlistwidget.o: playlistwidget.cpp \ + $(OPIEDIR)/include/qpe/qpemenubar.h \ + $(OPIEDIR)/include/qpe/qpetoolbar.h \ + $(OPIEDIR)/include/qpe/fileselector.h \ + $(OPIEDIR)/include/qpe/applnk.h \ + $(OPIEDIR)/include/qpe/config.h \ + $(OPIEDIR)/include/qpe/global.h \ + $(OPIEDIR)/include/qpe/resource.h \ playlistselection.h \ playlistwidget.h \ mediaplayerstate.h mediaplayer.o: mediaplayer.cpp \ + $(OPIEDIR)/include/qpe/qpeapplication.h \ + $(OPIEDIR)/include/qpe/qlibrary.h \ + $(OPIEDIR)/include/qpe/qcom.h \ + $(OPIEDIR)/include/qpe/quuid.h \ + $(OPIEDIR)/include/qpe/resource.h \ + $(OPIEDIR)/include/qpe/config.h \ mediaplayer.h \ + $(OPIEDIR)/include/qpe/mediaplayerplugininterface.h \ playlistwidget.h \ + $(OPIEDIR)/include/qpe/applnk.h \ audiowidget.h \ loopcontrol.h \ audiodevice.h \ mediaplayerstate.h audiodevice.o: audiodevice.cpp \ - audiodevice.h + $(OPIEDIR)/include/qpe/qpeapplication.h \ + $(OPIEDIR)/include/qpe/config.h \ + audiodevice.h \ + $(OPIEDIR)/include/qpe/qcopenvelope_qws.h moc_loopcontrol.o: moc_loopcontrol.cpp \ loopcontrol.h moc_playlistselection.o: moc_playlistselection.cpp \ - playlistselection.h + playlistselection.h \ + $(OPIEDIR)/include/qpe/applnk.h moc_mediaplayerstate.o: moc_mediaplayerstate.cpp \ mediaplayerstate.h @@ -199,10 +240,15 @@ moc_audiowidget.o: moc_audiowidget.cpp \ audiowidget.h moc_playlistwidget.o: moc_playlistwidget.cpp \ - playlistwidget.h + playlistwidget.h \ + $(OPIEDIR)/include/qpe/applnk.h moc_mediaplayer.o: moc_mediaplayer.cpp \ - mediaplayer.h + mediaplayer.h \ + $(OPIEDIR)/include/qpe/qlibrary.h \ + $(OPIEDIR)/include/qpe/qcom.h \ + $(OPIEDIR)/include/qpe/quuid.h \ + $(OPIEDIR)/include/qpe/mediaplayerplugininterface.h moc_audiodevice.o: moc_audiodevice.cpp \ audiodevice.h diff --git a/core/multimedia/opieplayer/libmad/Makefile.in b/core/multimedia/opieplayer/libmad/Makefile.in index d2e1cda..e9f74e7 100644 --- a/core/multimedia/opieplayer/libmad/Makefile.in +++ b/core/multimedia/opieplayer/libmad/Makefile.in @@ -100,10 +100,8 @@ $(DESTDIR)$(SYSCONF_LINK_TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC) $(SUBLIBS) moc: $(SRCMOC) -tmake: Makefile.in - -Makefile.in: libmad.pro - tmake libmad.pro -o Makefile.in +tmake: + tmake libmad.pro clean: -rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS) diff --git a/core/multimedia/opieplayer/libmpeg3/Makefile.in b/core/multimedia/opieplayer/libmpeg3/Makefile.in index 4ccdb8c..154f85d 100644 --- a/core/multimedia/opieplayer/libmpeg3/Makefile.in +++ b/core/multimedia/opieplayer/libmpeg3/Makefile.in @@ -129,10 +129,8 @@ $(DESTDIR)$(SYSCONF_LINK_TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC) $(SUBLIBS) moc: $(SRCMOC) -tmake: Makefile.in - -Makefile.in: libmpeg3.pro - tmake libmpeg3.pro -o Makefile.in +tmake: + tmake libmpeg3.pro clean: -rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS) diff --git a/core/multimedia/opieplayer/wavplugin/Makefile.in b/core/multimedia/opieplayer/wavplugin/Makefile.in index 560534e..bcbe7f2 100644 --- a/core/multimedia/opieplayer/wavplugin/Makefile.in +++ b/core/multimedia/opieplayer/wavplugin/Makefile.in @@ -65,10 +65,8 @@ $(DESTDIR)$(SYSCONF_LINK_TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC) $(SUBLIBS) moc: $(SRCMOC) -tmake: Makefile.in - -Makefile.in: wavplugin.pro - tmake wavplugin.pro -o Makefile.in +tmake: + tmake wavplugin.pro clean: -rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS) diff --git a/core/pim/datebook/Makefile.in b/core/pim/datebook/Makefile.in index cc31efe..0c3282e 100644 --- a/core/pim/datebook/Makefile.in +++ b/core/pim/datebook/Makefile.in @@ -124,10 +124,8 @@ $(DESTDIR)$(TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC) $(SUBLIBS) moc: $(SRCMOC) -tmake: Makefile.in - -Makefile.in: datebook.pro - tmake datebook.pro -o Makefile.in +tmake: + tmake datebook.pro clean: -rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS) @@ -161,40 +159,99 @@ REQUIRES= ####### Compile main.o: main.cpp \ - datebook.h + datebook.h \ + $(OPIEDIR)/include/qpe/datebookdb.h \ + $(OPIEDIR)/include/qpe/event.h \ + $(OPIEDIR)/include/qpe/palmtoprecord.h \ + $(OPIEDIR)/include/qpe/timeconversion.h \ + $(OPIEDIR)/include/qpe/qpcglobal.h \ + $(OPIEDIR)/include/qpe/qpeapplication.h datebookday.o: datebookday.cpp \ datebookday.h \ + $(OPIEDIR)/include/qpe/event.h \ + $(OPIEDIR)/include/qpe/palmtoprecord.h \ + $(OPIEDIR)/include/qpe/timeconversion.h \ + $(OPIEDIR)/include/qpe/qpcglobal.h \ datebookdayheaderimpl.h \ - datebookdayheader.h + datebookdayheader.h \ + $(OPIEDIR)/include/qpe/datebookdb.h \ + $(OPIEDIR)/include/qpe/resource.h \ + $(OPIEDIR)/include/qpe/qpeapplication.h \ + $(OPIEDIR)/include/qpe/timestring.h \ + $(OPIEDIR)/include/qpe/qpedebug.h datebook.o: datebook.cpp \ datebook.h \ + $(OPIEDIR)/include/qpe/datebookdb.h \ + $(OPIEDIR)/include/qpe/event.h \ + $(OPIEDIR)/include/qpe/palmtoprecord.h \ + $(OPIEDIR)/include/qpe/timeconversion.h \ + $(OPIEDIR)/include/qpe/qpcglobal.h \ datebookday.h \ datebooksettings.h \ datebooksettingsbase.h \ datebookweek.h \ dateentryimpl.h \ - dateentry.h + dateentry.h \ + $(OPIEDIR)/include/qpe/datebookmonth.h \ + $(OPIEDIR)/include/qpe/qpeapplication.h \ + $(OPIEDIR)/include/qpe/config.h \ + $(OPIEDIR)/include/qpe/qpedebug.h \ + $(OPIEDIR)/include/qpe/finddialog.h \ + $(OPIEDIR)/include/qpe/ir.h \ + $(OPIEDIR)/include/qpe/qpemenubar.h \ + $(OPIEDIR)/include/qpe/qpemessagebox.h \ + $(OPIEDIR)/include/qpe/resource.h \ + $(OPIEDIR)/include/qpe/sound.h \ + $(OPIEDIR)/include/qpe/timestring.h \ + $(OPIEDIR)/include/qpe/qpetoolbar.h \ + $(OPIEDIR)/include/qpe/tzselect.h \ + $(OPIEDIR)/include/qpe/xmlreader.h dateentryimpl.o: dateentryimpl.cpp \ dateentryimpl.h \ dateentry.h \ + $(OPIEDIR)/include/qpe/event.h \ + $(OPIEDIR)/include/qpe/palmtoprecord.h \ + $(OPIEDIR)/include/qpe/timeconversion.h \ + $(OPIEDIR)/include/qpe/qpcglobal.h \ repeatentry.h \ - repeatentrybase.h + repeatentrybase.h \ + $(OPIEDIR)/include/qpe/qpeapplication.h \ + $(OPIEDIR)/include/qpe/categoryselect.h \ + $(OPIEDIR)/include/qpe/datebookmonth.h \ + $(OPIEDIR)/include/qpe/global.h \ + $(OPIEDIR)/include/qpe/timestring.h \ + $(OPIEDIR)/include/qpe/tzselect.h datebookdayheaderimpl.o: datebookdayheaderimpl.cpp \ datebookdayheaderimpl.h \ - datebookdayheader.h + datebookdayheader.h \ + $(OPIEDIR)/include/qpe/datebookmonth.h \ + $(OPIEDIR)/include/qpe/event.h \ + $(OPIEDIR)/include/qpe/palmtoprecord.h \ + $(OPIEDIR)/include/qpe/timeconversion.h \ + $(OPIEDIR)/include/qpe/qpcglobal.h \ + $(OPIEDIR)/include/qpe/timestring.h datebooksettings.o: datebooksettings.cpp \ datebooksettings.h \ - datebooksettingsbase.h + datebooksettingsbase.h \ + $(OPIEDIR)/include/qpe/qpeapplication.h datebookweek.o: datebookweek.cpp \ datebookweek.h \ + $(OPIEDIR)/include/qpe/event.h \ + $(OPIEDIR)/include/qpe/palmtoprecord.h \ + $(OPIEDIR)/include/qpe/timeconversion.h \ + $(OPIEDIR)/include/qpe/qpcglobal.h \ datebookweekheaderimpl.h \ - datebookweekheader.h + datebookweekheader.h \ + $(OPIEDIR)/include/qpe/calendar.h \ + $(OPIEDIR)/include/qpe/datebookdb.h \ + $(OPIEDIR)/include/qpe/qpeapplication.h \ + $(OPIEDIR)/include/qpe/timestring.h datebookweekheaderimpl.o: datebookweekheaderimpl.cpp \ datebookweekheaderimpl.h \ @@ -202,7 +259,14 @@ datebookweekheaderimpl.o: datebookweekheaderimpl.cpp \ repeatentry.o: repeatentry.cpp \ repeatentry.h \ - repeatentrybase.h + repeatentrybase.h \ + $(OPIEDIR)/include/qpe/event.h \ + $(OPIEDIR)/include/qpe/palmtoprecord.h \ + $(OPIEDIR)/include/qpe/timeconversion.h \ + $(OPIEDIR)/include/qpe/qpcglobal.h \ + $(OPIEDIR)/include/qpe/datebookmonth.h \ + $(OPIEDIR)/include/qpe/qpeapplication.h \ + $(OPIEDIR)/include/qpe/timestring.h dateentry.h: dateentry.ui $(UIC) dateentry.ui -o $(INTERFACE_DECL_PATH)/dateentry.h @@ -245,21 +309,38 @@ datebookweekheader.o: datebookweekheader.cpp repeatentrybase.o: repeatentrybase.cpp moc_datebookday.o: moc_datebookday.cpp \ - datebookday.h + datebookday.h \ + $(OPIEDIR)/include/qpe/event.h \ + $(OPIEDIR)/include/qpe/palmtoprecord.h \ + $(OPIEDIR)/include/qpe/timeconversion.h \ + $(OPIEDIR)/include/qpe/qpcglobal.h moc_datebook.o: moc_datebook.cpp \ - datebook.h + datebook.h \ + $(OPIEDIR)/include/qpe/datebookdb.h \ + $(OPIEDIR)/include/qpe/event.h \ + $(OPIEDIR)/include/qpe/palmtoprecord.h \ + $(OPIEDIR)/include/qpe/timeconversion.h \ + $(OPIEDIR)/include/qpe/qpcglobal.h moc_dateentryimpl.o: moc_dateentryimpl.cpp \ dateentryimpl.h \ - dateentry.h + dateentry.h \ + $(OPIEDIR)/include/qpe/event.h \ + $(OPIEDIR)/include/qpe/palmtoprecord.h \ + $(OPIEDIR)/include/qpe/timeconversion.h \ + $(OPIEDIR)/include/qpe/qpcglobal.h moc_datebookdayheaderimpl.o: moc_datebookdayheaderimpl.cpp \ datebookdayheaderimpl.h \ datebookdayheader.h moc_datebookweek.o: moc_datebookweek.cpp \ - datebookweek.h + datebookweek.h \ + $(OPIEDIR)/include/qpe/event.h \ + $(OPIEDIR)/include/qpe/palmtoprecord.h \ + $(OPIEDIR)/include/qpe/timeconversion.h \ + $(OPIEDIR)/include/qpe/qpcglobal.h moc_datebookweekheaderimpl.o: moc_datebookweekheaderimpl.cpp \ datebookweekheaderimpl.h \ @@ -267,7 +348,11 @@ moc_datebookweekheaderimpl.o: moc_datebookweekheaderimpl.cpp \ moc_repeatentry.o: moc_repeatentry.cpp \ repeatentry.h \ - repeatentrybase.h + repeatentrybase.h \ + $(OPIEDIR)/include/qpe/event.h \ + $(OPIEDIR)/include/qpe/palmtoprecord.h \ + $(OPIEDIR)/include/qpe/timeconversion.h \ + $(OPIEDIR)/include/qpe/qpcglobal.h moc_dateentry.o: moc_dateentry.cpp \ dateentry.h diff --git a/freetype/Makefile.in b/freetype/Makefile.in index ba4c829..cdc6fa4 100644 --- a/freetype/Makefile.in +++ b/freetype/Makefile.in @@ -6,7 +6,7 @@ CXX = $(SYSCONF_CXX) $(QT_CXX_MT) CXXFLAGS= $(SYSCONF_CXXFLAGS_QT) $(SYSCONF_CXXFLAGS) $(SYSCONF_CXXFLAGS_LIB) CC = $(SYSCONF_CC) $(QT_C_MT) CFLAGS = $(SYSCONF_CFLAGS) $(SYSCONF_CFLAGS_LIB) -INCPATH = -I../library +INCPATH = -I$(OPIEDIR)/include LFLAGS = $(SYSCONF_LFLAGS_QT) $(SYSCONF_RPATH_QT) $(SYSCONF_LFLAGS) $(QT_LFLAGS_MT) LIBS = $(SUBLIBS) -lqpe -lfreetype $(SYSCONF_LIBS_QT) $(SYSCONF_LIBS_QTAPP) MOC = $(SYSCONF_MOC) @@ -24,8 +24,7 @@ TARGET1 = lib$(TARGET).so.$(VER_MAJ) ####### Files HEADERS = fontfactoryttf_qws.h \ - freetypefactoryimpl.h \ - qfontdata_p.h + freetypefactoryimpl.h SOURCES = fontfactoryttf_qws.cpp \ freetypefactoryimpl.cpp OBJECTS = fontfactoryttf_qws.o \ @@ -109,9 +108,6 @@ fontfactoryttf_qws.o: fontfactoryttf_qws.cpp \ freetypefactoryimpl.o: freetypefactoryimpl.cpp \ fontfactoryttf_qws.h \ qfontdata_p.h \ - freetypefactoryimpl.h \ - ../library/fontfactoryinterface.h \ - ../library/qcom.h \ - ../library/quuid.h + freetypefactoryimpl.h diff --git a/library/Makefile.in b/library/Makefile.in index b8fc1f6..dcea4b8 100644 --- a/library/Makefile.in +++ b/library/Makefile.in @@ -78,7 +78,11 @@ HEADERS = calendar.h \ backend/vobject_p.h \ findwidget_p.h \ finddialog.h \ - lnkproperties.h + lnkproperties.h \ + quuid.h \ + qcom.h \ + qlibrary.h \ + qlibrary_p.h SOURCES = calendar.cpp \ global.cpp \ xmlreader.cpp \ @@ -133,7 +137,10 @@ SOURCES = calendar.cpp \ backend/vobject.cpp \ findwidget_p.cpp \ finddialog.cpp \ - lnkproperties.cpp + lnkproperties.cpp \ + quuid.cpp \ + qlibrary.cpp \ + qlibrary_unix.cpp OBJECTS = calendar.o \ global.o \ xmlreader.o \ @@ -189,6 +196,9 @@ OBJECTS = calendar.o \ findwidget_p.o \ finddialog.o \ lnkproperties.o \ + quuid.o \ + qlibrary.o \ + qlibrary_unix.o \ passwordbase_p.o \ categoryeditbase_p.o \ findwidgetbase_p.o \ @@ -226,6 +236,7 @@ SRCMOC = moc_menubutton.cpp \ moc_findwidget_p.cpp \ moc_finddialog.cpp \ moc_lnkproperties.cpp \ + moc_qlibrary_p.cpp \ global.moc \ network.moc \ password.moc \ @@ -256,6 +267,7 @@ OBJMOC = moc_menubutton.o \ moc_findwidget_p.o \ moc_finddialog.o \ moc_lnkproperties.o \ + moc_qlibrary_p.o \ moc_passwordbase_p.o \ moc_categoryeditbase_p.o \ moc_findwidgetbase_p.o \ @@ -291,10 +303,8 @@ $(DESTDIR)$(SYSCONF_LINK_TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC) $(SUBLIBS) moc: $(SRCMOC) -tmake: Makefile.in - -Makefile.in: library.pro - tmake library.pro -o Makefile.in +tmake: + tmake library.pro clean: -rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS) @@ -602,6 +612,17 @@ lnkproperties.o: lnkproperties.cpp \ lnkpropertiesbase_p.h \ ir.h +quuid.o: quuid.cpp \ + quuid.h + +qlibrary.o: qlibrary.cpp \ + qlibrary_p.h \ + qlibrary.h + +qlibrary_unix.o: qlibrary_unix.cpp \ + qlibrary_p.h \ + qlibrary.h + passwordbase_p.h: passwordbase_p.ui $(UIC) passwordbase_p.ui -o $(INTERFACE_DECL_PATH)/passwordbase_p.h @@ -707,6 +728,10 @@ moc_finddialog.o: moc_finddialog.cpp \ moc_lnkproperties.o: moc_lnkproperties.cpp \ lnkproperties.h +moc_qlibrary_p.o: moc_qlibrary_p.cpp \ + qlibrary_p.h \ + qlibrary.h + moc_passwordbase_p.o: global.moc \ global.cpp @@ -788,6 +813,9 @@ moc_finddialog.cpp: finddialog.h moc_lnkproperties.cpp: lnkproperties.h $(MOC) lnkproperties.h -o moc_lnkproperties.cpp +moc_qlibrary_p.cpp: qlibrary_p.h + $(MOC) qlibrary_p.h -o moc_qlibrary_p.cpp + global.moc: global.cpp $(MOC) global.cpp -o global.moc diff --git a/noncore/apps/tableviewer/Makefile.in b/noncore/apps/tableviewer/Makefile.in index 8c5dc26..e135d82 100644 --- a/noncore/apps/tableviewer/Makefile.in +++ b/noncore/apps/tableviewer/Makefile.in @@ -6,7 +6,7 @@ CXX = $(SYSCONF_CXX) $(QT_CXX_MT) CXXFLAGS= $(SYSCONF_CXXFLAGS_QT) $(SYSCONF_CXXFLAGS) CC = $(SYSCONF_CC) $(QT_C_MT) CFLAGS = $(SYSCONF_CFLAGS) -INCPATH = -I../library +INCPATH = -I$(OPIEDIR)/include LFLAGS = $(SYSCONF_LFLAGS_QT) $(SYSCONF_RPATH_QT) $(SYSCONF_LFLAGS) $(QT_LFLAGS_MT) LIBS = $(SUBLIBS) -lqpe $(SYSCONF_LIBS_QT) $(SYSCONF_LIBS) $(SYSCONF_LIBS_QTAPP) MOC = $(SYSCONF_MOC) @@ -157,19 +157,11 @@ REQUIRES= main.o: main.cpp \ tableviewer.h \ - db/common.h \ - ../library/fileselector.h \ - ../library/filemanager.h \ - ../library/applnk.h \ - ../library/qpeapplication.h \ - ../library/qpedecoration_qws.h + db/common.h tableviewer.o: tableviewer.cpp \ tableviewer.h \ db/common.h \ - ../library/fileselector.h \ - ../library/filemanager.h \ - ../library/applnk.h \ ui/tvbrowseview.h \ ui/tvfilterview.h \ ui/tvlistview.h \ @@ -177,13 +169,9 @@ tableviewer.o: tableviewer.cpp \ ui/tvkeyedit.h \ tvkeyedit_gen.h \ db/datacache.h \ - ../library/resource.h + /home/kergoth/roms/openzaurus/buildroot-oz/build/opie/include/qpe/qpemenubar.h ui/commonwidgets.o: ui/commonwidgets.cpp \ - ../library/datebookmonth.h \ - ../library/organizer.h \ - ../library/xmlreader.h \ - ../library/calendar.h \ ui/commonwidgets.h ui/tvbrowseview.o: ui/tvbrowseview.cpp \ @@ -237,7 +225,6 @@ db/csvsource.o: db/csvsource.cpp \ db/common.h db/common.o: db/common.cpp \ - ../library/timestring.h \ db/common.h \ db/datacache.h @@ -256,10 +243,7 @@ ui/tvkeyedit_gen.o: ui/tvkeyedit_gen.cpp \ moc_tableviewer.o: moc_tableviewer.cpp \ tableviewer.h \ - db/common.h \ - ../library/fileselector.h \ - ../library/filemanager.h \ - ../library/applnk.h + db/common.h ui/moc_commonwidgets.o: ui/moc_commonwidgets.cpp \ ui/commonwidgets.h diff --git a/noncore/games/chess/Makefile.in b/noncore/games/chess/Makefile.in index a1f2cd7..0987d58 100644 --- a/noncore/games/chess/Makefile.in +++ b/noncore/games/chess/Makefile.in @@ -104,10 +104,16 @@ REQUIRES= ####### Compile chess.o: chess.cpp \ - chess.h + /home/kergoth/roms/openzaurus/buildroot-oz/build/opie/include/qpe/config.h \ + /home/kergoth/roms/openzaurus/buildroot-oz/build/opie/include/qpe/resource.h \ + chess.h \ + /home/kergoth/roms/openzaurus/buildroot-oz/build/opie/include/qpe/process.h main.o: main.cpp \ - chess.h + /home/kergoth/roms/openzaurus/buildroot-oz/build/opie/include/qpe/qpeapplication.h \ + /home/kergoth/roms/openzaurus/buildroot-oz/build/opie/include/qpe/qpetoolbar.h \ + chess.h \ + /home/kergoth/roms/openzaurus/buildroot-oz/build/opie/include/qpe/process.h mainwindow.h: mainwindow.ui $(UIC) mainwindow.ui -o $(INTERFACE_DECL_PATH)/mainwindow.h @@ -120,7 +126,8 @@ mainwindow.o: mainwindow.cpp \ mainwindow.ui moc_chess.o: moc_chess.cpp \ - chess.h + chess.h \ + /home/kergoth/roms/openzaurus/buildroot-oz/build/opie/include/qpe/process.h moc_mainwindow.o: moc_mainwindow.cpp \ mainwindow.h diff --git a/noncore/games/go/Makefile.in b/noncore/games/go/Makefile.in index 0395dff..985eff0 100644 --- a/noncore/games/go/Makefile.in +++ b/noncore/games/go/Makefile.in @@ -75,10 +75,8 @@ $(DESTDIR)$(TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC) $(SUBLIBS) moc: $(SRCMOC) -tmake: Makefile.in - -Makefile.in: go.pro - tmake go.pro -o Makefile.in +tmake: + tmake go.pro clean: -rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS) @@ -135,13 +133,18 @@ gowidget.o: gowidget.cpp \ gowidget.h \ amigo.h \ go.h \ - goplayutils.h + goplayutils.h \ + $(OPIEDIR)/include/qpe/config.h \ + $(OPIEDIR)/include/qpe/resource.h \ + $(OPIEDIR)/include/qpe/qpetoolbar.h \ + $(OPIEDIR)/include/qpe/qpemenubar.h main.o: main.cpp \ gowidget.h \ amigo.h \ go.h \ - goplayutils.h + goplayutils.h \ + $(OPIEDIR)/include/qpe/qpeapplication.h moc_gowidget.o: moc_gowidget.cpp \ gowidget.h \ diff --git a/quickexec/Makefile.in b/quickexec/Makefile.in index 514e6cc..d3ac9dc 100644 --- a/quickexec/Makefile.in +++ b/quickexec/Makefile.in @@ -62,8 +62,10 @@ $(DESTDIR)$(TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC) $(SUBLIBS) moc: $(SRCMOC) -tmake: - tmake quickexec.pro +tmake: Makefile.in + +Makefile.in: quickexec.pro + tmake quickexec.pro -o Makefile.in clean: -rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS) diff --git a/rsync/Makefile.in b/rsync/Makefile.in index 50e7b3d..e69de29 100644 --- a/rsync/Makefile.in +++ b/rsync/Makefile.in @@ -1,391 +0,0 @@ -############################################################################# - -####### Compiler, tools and options - -CXX = $(SYSCONF_CXX) $(QT_CXX_MT) -CXXFLAGS= $(SYSCONF_CXXFLAGS_QT) $(SYSCONF_CXXFLAGS) $(SYSCONF_CXXFLAGS_LIB) -CC = $(SYSCONF_CC) $(QT_C_MT) -CFLAGS = $(SYSCONF_CFLAGS) $(SYSCONF_CFLAGS_LIB) -INCPATH = -I. -LFLAGS = $(SYSCONF_LFLAGS_QT) $(SYSCONF_RPATH_QT) $(SYSCONF_LFLAGS) $(QT_LFLAGS_MT) -LIBS = $(SUBLIBS) $(SYSCONF_LIBS_QT) $(SYSCONF_LIBS_QTAPP) -MOC = $(SYSCONF_MOC) -UIC = $(SYSCONF_UIC) - -####### Target - -DESTDIR = $(QTDIR)/lib$(PROJMAK)/ -VER_MAJ = 1 -VER_MIN = 0 -VER_PATCH = 0 -TARGET = rsync -TARGET1 = lib$(TARGET).so.$(VER_MAJ) - -####### Files - -HEADERS = buf.h \ - checksum.h \ - command.h \ - emit.h \ - fileutil.h \ - job.h \ - netint.h \ - protocol.h \ - prototab.h \ - rsync.h \ - search.h \ - stream.h \ - sumset.h \ - trace.h \ - types.h \ - util.h \ - whole.h \ - config.h -SOURCES = base64.c \ - buf.c \ - checksum.c \ - command.c \ - delta.c \ - emit.c \ - fileutil.c \ - hex.c \ - job.c \ - mdfour.c \ - mksum.c \ - msg.c \ - netint.c \ - patch.c \ - prototab.c \ - readsums.c \ - scoop.c \ - search.c \ - stats.c \ - stream.c \ - sumset.c \ - trace.c \ - tube.c \ - util.c \ - version.c \ - whole.c -OBJECTS = base64.o \ - buf.o \ - checksum.o \ - command.o \ - delta.o \ - emit.o \ - fileutil.o \ - hex.o \ - job.o \ - mdfour.o \ - mksum.o \ - msg.o \ - netint.o \ - patch.o \ - prototab.o \ - readsums.o \ - scoop.o \ - search.o \ - stats.o \ - stream.o \ - sumset.o \ - trace.o \ - tube.o \ - util.o \ - version.o \ - whole.o -INTERFACES = -UICDECLS = -UICIMPLS = -SRCMOC = -OBJMOC = - - -####### Implicit rules - -.SUFFIXES: .cpp .cxx .cc .C .c - -.cpp.o: - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $< - -.cxx.o: - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $< - -.cc.o: - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $< - -.C.o: - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $< - -.c.o: - $(CC) -c $(CFLAGS) $(INCPATH) -o $@ $< - -####### Build rules - - -all: $(DESTDIR)$(SYSCONF_LINK_TARGET) - -$(DESTDIR)$(SYSCONF_LINK_TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC) $(SUBLIBS) - $(SYSCONF_LINK_LIB) - -moc: $(SRCMOC) - -tmake: Makefile.in - -Makefile.in: rsync.pro - tmake rsync.pro -o Makefile.in - -clean: - -rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS) - -rm -f *~ core - -rm -f allmoc.cpp - -####### Extension Modules - -listpromodules: - @echo - -listallmodules: - @echo - -listaddonpromodules: - @echo - -listaddonentmodules: - @echo - - -REQUIRES= - -####### Sub-libraries - - -###### Combined headers - - - -####### Compile - -base64.o: base64.c \ - config.h \ - config_linux.h \ - rsync.h - -buf.o: buf.c \ - config.h \ - config_linux.h \ - rsync.h \ - trace.h \ - buf.h \ - util.h - -checksum.o: checksum.c \ - config.h \ - config_linux.h \ - rsync.h \ - checksum.h - -command.o: command.c \ - config.h \ - config_linux.h \ - rsync.h \ - command.h - -delta.o: delta.c \ - config.h \ - config_linux.h \ - rsync.h \ - emit.h \ - stream.h \ - util.h \ - sumset.h \ - job.h \ - trace.h \ - checksum.h \ - search.h \ - types.h - -emit.o: emit.c \ - config.h \ - config_linux.h \ - rsync.h \ - command.h \ - protocol.h \ - trace.h \ - emit.h \ - prototab.h \ - netint.h \ - sumset.h \ - job.h - -fileutil.o: fileutil.c \ - config.h \ - config_linux.h \ - rsync.h \ - fileutil.h \ - trace.h - -hex.o: hex.c \ - config.h \ - config_linux.h \ - rsync.h - -job.o: job.c \ - config.h \ - config_linux.h \ - rsync.h \ - stream.h \ - util.h \ - sumset.h \ - job.h \ - trace.h - -mdfour.o: mdfour.c \ - config.h \ - config_linux.h \ - rsync.h \ - trace.h \ - types.h - -mksum.o: mksum.c \ - config.h \ - config_linux.h \ - rsync.h \ - stream.h \ - util.h \ - sumset.h \ - job.h \ - protocol.h \ - netint.h \ - trace.h \ - checksum.h - -msg.o: msg.c \ - config.h \ - config_linux.h \ - rsync.h - -netint.o: netint.c \ - config.h \ - config_linux.h \ - rsync.h \ - job.h \ - netint.h \ - trace.h \ - stream.h - -patch.o: patch.c \ - config.h \ - config_linux.h \ - rsync.h \ - util.h \ - trace.h \ - protocol.h \ - netint.h \ - command.h \ - sumset.h \ - prototab.h \ - stream.h \ - job.h - -prototab.o: prototab.c \ - config.h \ - config_linux.h \ - rsync.h \ - protocol.h \ - command.h \ - prototab.h - -readsums.o: readsums.c \ - config.h \ - config_linux.h \ - rsync.h \ - sumset.h \ - job.h \ - trace.h \ - netint.h \ - protocol.h \ - util.h \ - stream.h - -scoop.o: scoop.c \ - config.h \ - config_linux.h \ - rsync.h \ - job.h \ - stream.h \ - trace.h \ - util.h - -search.o: search.c \ - config.h \ - config_linux.h \ - rsync.h \ - trace.h \ - util.h \ - sumset.h \ - search.h \ - checksum.h - -stats.o: stats.c \ - config.h \ - config_linux.h \ - rsync.h \ - trace.h - -stream.o: stream.c \ - config.h \ - config_linux.h \ - rsync.h \ - stream.h \ - util.h \ - trace.h - -sumset.o: sumset.c \ - config.h \ - config_linux.h \ - rsync.h \ - sumset.h \ - util.h \ - trace.h - -trace.o: trace.c \ - config.h \ - config_linux.h \ - rsync.h \ - util.h \ - trace.h - -tube.o: tube.c \ - config.h \ - config_linux.h \ - rsync.h \ - trace.h \ - util.h \ - job.h \ - stream.h - -util.o: util.c \ - config.h \ - config_linux.h \ - util.h \ - rsync.h \ - trace.h - -version.o: version.c \ - config.h \ - config_linux.h \ - rsync.h - -whole.o: whole.c \ - config.h \ - config_linux.h \ - rsync.h \ - trace.h \ - fileutil.h \ - sumset.h \ - job.h \ - buf.h \ - whole.h \ - util.h - - -- cgit v0.9.0.2