author | kergoth <kergoth> | 2002-01-28 23:28:04 (UTC) |
---|---|---|
committer | kergoth <kergoth> | 2002-01-28 23:28:04 (UTC) |
commit | f7b3193e5d2d9a211ce0b963dca571d82adecb71 (patch) (side-by-side diff) | |
tree | 44f49bdc076dc299bba1a4dc8d5d517114be5701 /noncore/tools | |
parent | 77d110d35f75d63f5dc66c1dd2427daf7dc2e214 (diff) | |
download | opie-f7b3193e5d2d9a211ce0b963dca571d82adecb71.zip opie-f7b3193e5d2d9a211ce0b963dca571d82adecb71.tar.gz opie-f7b3193e5d2d9a211ce0b963dca571d82adecb71.tar.bz2 |
Committing in .
Modified Files:
configure mkipks addressbook/Makefile.in
addressbook/addressbook.pro calc2/calc.pro
calc2/binary/binary.pro calc2/simple/simple.pro
calculator/Makefile.in calculator/calculator.pro
cardmon/Makefile.in cardmon/cardmon.pro chess/chess.pro
citytime/Makefile.in citytime/citytime.pro clock/Makefile.in
clock/clock.pro datebook/Makefile.in datebook/datebook.pro
dictionary/dictionary.pro doc/qcop.doc doc/start.doc
embeddedkonsole/Makefile.in
embeddedkonsole/embeddedkonsole.pro etc/init.d/qpe
example/example.pro fifteen/Makefile.in fifteen/fifteen.pro
filebrowser/Makefile.in filebrowser/filebrowser.pro
freetype/freetype.pro go/Makefile.in go/go.pro
helpbrowser/Makefile.in helpbrowser/helpbrowser.pro
inputmethods/handwriting/Makefile.in
inputmethods/handwriting/handwriting.pro
inputmethods/keyboard/Makefile.in
inputmethods/keyboard/keyboard.pro
inputmethods/pickboard/Makefile.in
inputmethods/pickboard/pickboard.pro
inputmethods/unikeyboard/Makefile.in
inputmethods/unikeyboard/unikeyboard.pro keypebble/Makefile.in
keypebble/keypebble.pro library/Makefile.in library/global.cpp
library/library.pro library/qpeapplication.cpp
mindbreaker/Makefile.in mindbreaker/mindbreaker.pro
minesweep/Makefile.in minesweep/minesweep.pro
mpegplayer/Makefile.in mpegplayer/mpegplayer.pro
mpegplayer/libflash/libflash.pro mpegplayer/libmad/Makefile.in
mpegplayer/libmad/libmad.pro mpegplayer/libmpeg3/Makefile.in
mpegplayer/libmpeg3/libmpeg3.pro
mpegplayer/libmpeg3/audio/Makefile
mpegplayer/libmpeg3/video/Makefile
mpegplayer/wavplugin/Makefile.in
mpegplayer/wavplugin/wavplugin.pro netsetup/Makefile.in
netsetup/README netsetup/netsetup.pro
netsetup/dialup/Makefile.in netsetup/dialup/dialup.pro
netsetup/lan/Makefile.in netsetup/lan/lan.pro
parashoot/Makefile.in parashoot/parashoot.pro
qasteroids/Makefile.in qasteroids/qasteroids.pro
qcop/Makefile.in qcop/qcop.pro qipkg/Makefile.in
qipkg/qipkg.pro scripts/q_functions
settings/appearance/Makefile.in
settings/appearance/appearance.pro
settings/language/Makefile.in settings/language/language.pro
settings/light-and-power/Makefile.in
settings/light-and-power/light-and-power.pro
settings/rotation/Makefile.in settings/rotation/rotation.pro
settings/security/Makefile.in settings/security/security.pro
settings/sound/Makefile.in settings/sound/sound.pro
settings/systemtime/Makefile.in
settings/systemtime/systemtime.pro showimg/Makefile.in
showimg/showimg.pro single/Makefile.in single/single.pro
snake/Makefile.in snake/snake.pro solitaire/Makefile.in
solitaire/solitaire.pro spreadsheet/Makefile.in
spreadsheet/spreadsheet.pro sysinfo/Makefile.in
sysinfo/sysinfo.pro tableviewer/tableviewer.pro
taskbar/Makefile.in taskbar/main.cpp taskbar/taskbar.pro
taskbar/batteryapplet/Makefile.in
taskbar/batteryapplet/batteryapplet.pro
taskbar/clipboardapplet/clipboardapplet.pro
taskbar/clockapplet/Makefile.in
taskbar/clockapplet/clockapplet.pro
taskbar/netmonapplet/Makefile.in
taskbar/netmonapplet/netmonapplet.pro
taskbar/volumeapplet/Makefile.in
taskbar/volumeapplet/volumeapplet.pro tetrix/Makefile.in
tetrix/tetrix.pro textedit/Makefile.in textedit/textedit.pro
todo/Makefile.in todo/todo.pro tux/Makefile.in tux/tux.pro
website/htdocs/build.html website/htdocs/development.html
website/htdocs/refman/qcop.html
website/htdocs/refman/qpeapplication.html wordgame/Makefile.in
wordgame/wordgame.pro
Log Message:
Changed QPEDIR to OPIEDIR in .pro files, and documentation,
and regenerated all Makefile.in's that were affected.
-rw-r--r-- | noncore/tools/calc2/binary/binary.pro | 8 | ||||
-rw-r--r-- | noncore/tools/calc2/calc.pro | 4 | ||||
-rw-r--r-- | noncore/tools/calc2/simple/simple.pro | 8 | ||||
-rw-r--r-- | noncore/tools/calculator/Makefile.in | 14 | ||||
-rw-r--r-- | noncore/tools/calculator/calculator.pro | 6 | ||||
-rw-r--r-- | noncore/tools/clock/Makefile.in | 14 | ||||
-rw-r--r-- | noncore/tools/clock/clock.pro | 6 |
7 files changed, 30 insertions, 30 deletions
diff --git a/noncore/tools/calc2/binary/binary.pro b/noncore/tools/calc2/binary/binary.pro index 01ba6a4..2e9ed78 100644 --- a/noncore/tools/calc2/binary/binary.pro +++ b/noncore/tools/calc2/binary/binary.pro @@ -1,16 +1,16 @@ TEMPLATE = lib CONFIG -= moc CONFIG += qt release # Input INTERFACES += binary.ui HEADERS = binaryimpl.h \ binaryfactory.h SOURCES = binaryimpl.cpp \ binaryfactory.cpp -INCLUDEPATH += $(QPEDIR)/include \ - $(QPEDIR)/calc2 -DEPENDPATH += $(QPEDIR)/include +INCLUDEPATH += $(OPIEDIR)/include \ + $(OPIEDIR)/calc2 +DEPENDPATH += $(OPIEDIR)/include -DESTDIR = $(QPEDIR)/plugins/calculator +DESTDIR = $(OPIEDIR)/plugins/calculator diff --git a/noncore/tools/calc2/calc.pro b/noncore/tools/calc2/calc.pro index c10232a..00e13b7 100644 --- a/noncore/tools/calc2/calc.pro +++ b/noncore/tools/calc2/calc.pro @@ -1,11 +1,11 @@ TEMPLATE = app CONFIG += qt release # Input HEADERS += calc.h plugininterface.h instruction.h engine.h stdinstructions.h SOURCES += calc.cpp main.cpp engine.cpp -INCLUDEPATH += $(QPEDIR)/include -DEPENDPATH += $(QPEDIR)/include +INCLUDEPATH += $(OPIEDIR)/include +DEPENDPATH += $(OPIEDIR)/include LIBS += -lqpe -Wl,-export-dynamic diff --git a/noncore/tools/calc2/simple/simple.pro b/noncore/tools/calc2/simple/simple.pro index 92378a6..9e5d4e0 100644 --- a/noncore/tools/calc2/simple/simple.pro +++ b/noncore/tools/calc2/simple/simple.pro @@ -1,14 +1,14 @@ TEMPLATE = lib CONFIG -= moc CONFIG += qt release # Input INTERFACES += simple.ui HEADERS = simpleimpl.h simplefactory.h stdinstructions.h SOURCES = simpleimpl.cpp simplefactory.cpp -INCLUDEPATH += $(QPEDIR)/include \ - $(QPEDIR)/calc2 -DEPENDPATH += $(QPEDIR)/include +INCLUDEPATH += $(OPIEDIR)/include \ + $(OPIEDIR)/calc2 +DEPENDPATH += $(OPIEDIR)/include -DESTDIR = $(QPEDIR)/plugins/calculator +DESTDIR = $(OPIEDIR)/plugins/calculator diff --git a/noncore/tools/calculator/Makefile.in b/noncore/tools/calculator/Makefile.in index d62b046..ba78df5 100644 --- a/noncore/tools/calculator/Makefile.in +++ b/noncore/tools/calculator/Makefile.in @@ -1,139 +1,139 @@ ############################################################################# ####### Compiler, tools and options CXX = $(SYSCONF_CXX) $(QT_CXX_MT) CXXFLAGS= $(SYSCONF_CXXFLAGS_QT) $(SYSCONF_CXXFLAGS) CC = $(SYSCONF_CC) $(QT_C_MT) CFLAGS = $(SYSCONF_CFLAGS) -INCPATH = -I$(QPEDIR)/include +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) UIC = $(SYSCONF_UIC) ####### Target -DESTDIR = $(QPEDIR)/bin/ +DESTDIR = $(OPIEDIR)/bin/ VER_MAJ = 1 VER_MIN = 0 VER_PATCH = 0 TARGET = calculator TARGET1 = lib$(TARGET).so.$(VER_MAJ) ####### Files HEADERS = calculatorimpl.h SOURCES = calculatorimpl.cpp \ main.cpp OBJECTS = calculatorimpl.o \ main.o \ calculator.o INTERFACES = calculator.ui UICDECLS = calculator.h UICIMPLS = calculator.cpp SRCMOC = moc_calculatorimpl.cpp \ moc_calculator.cpp OBJMOC = moc_calculatorimpl.o \ moc_calculator.o ####### 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)$(TARGET) $(DESTDIR)$(TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC) $(SUBLIBS) $(SYSCONF_LINK) $(LFLAGS) -o $(DESTDIR)$(TARGET) $(OBJECTS) $(OBJMOC) $(LIBS) moc: $(SRCMOC) tmake: tmake calculator.pro 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 calculatorimpl.o: calculatorimpl.cpp \ calculatorimpl.h \ calculator.h \ - $(QPEDIR)/include/qpe/resource.h \ - $(QPEDIR)/include/qpe/qmath.h \ - $(QPEDIR)/include/qpe/qpeapplication.h + $(OPIEDIR)/include/qpe/resource.h \ + $(OPIEDIR)/include/qpe/qmath.h \ + $(OPIEDIR)/include/qpe/qpeapplication.h main.o: main.cpp \ calculatorimpl.h \ calculator.h \ - $(QPEDIR)/include/qpe/qpeapplication.h + $(OPIEDIR)/include/qpe/qpeapplication.h calculator.h: calculator.ui - $(UIC) calculator.ui -o calculator.h + $(UIC) calculator.ui -o $(INTERFACE_DECL_PATH)/calculator.h calculator.cpp: calculator.ui $(UIC) calculator.ui -i calculator.h -o calculator.cpp calculator.o: calculator.cpp \ calculator.h \ calculator.ui moc_calculatorimpl.o: moc_calculatorimpl.cpp \ calculatorimpl.h \ calculator.h moc_calculator.o: moc_calculator.cpp \ calculator.h moc_calculatorimpl.cpp: calculatorimpl.h $(MOC) calculatorimpl.h -o moc_calculatorimpl.cpp moc_calculator.cpp: calculator.h $(MOC) calculator.h -o moc_calculator.cpp diff --git a/noncore/tools/calculator/calculator.pro b/noncore/tools/calculator/calculator.pro index 1281fd5..9554d2a 100644 --- a/noncore/tools/calculator/calculator.pro +++ b/noncore/tools/calculator/calculator.pro @@ -1,13 +1,13 @@ -DESTDIR = $(QPEDIR)/bin +DESTDIR = $(OPIEDIR)/bin TEMPLATE = app CONFIG = qt warn_on release HEADERS = calculatorimpl.h SOURCES = calculatorimpl.cpp \ main.cpp -INCLUDEPATH += $(QPEDIR)/include -DEPENDPATH += $(QPEDIR)/include +INCLUDEPATH += $(OPIEDIR)/include +DEPENDPATH += $(OPIEDIR)/include LIBS += -lqpe INTERFACES = calculator.ui TARGET = calculator TRANSLATIONS = ../i18n/de/calculator.ts diff --git a/noncore/tools/clock/Makefile.in b/noncore/tools/clock/Makefile.in index adda9e6..efa7808 100644 --- a/noncore/tools/clock/Makefile.in +++ b/noncore/tools/clock/Makefile.in @@ -1,118 +1,118 @@ ############################################################################# ####### Compiler, tools and options CXX = $(SYSCONF_CXX) $(QT_CXX_MT) CXXFLAGS= $(SYSCONF_CXXFLAGS_QT) $(SYSCONF_CXXFLAGS) CC = $(SYSCONF_CC) $(QT_C_MT) CFLAGS = $(SYSCONF_CFLAGS) -INCPATH = -I$(QPEDIR)/include +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) UIC = $(SYSCONF_UIC) ####### Target -DESTDIR = $(QPEDIR)/bin/ +DESTDIR = $(OPIEDIR)/bin/ VER_MAJ = 1 VER_MIN = 0 VER_PATCH = 0 TARGET = clock TARGET1 = lib$(TARGET).so.$(VER_MAJ) ####### Files HEADERS = clock.h SOURCES = clock.cpp \ main.cpp OBJECTS = clock.o \ main.o INTERFACES = UICDECLS = UICIMPLS = SRCMOC = moc_clock.cpp OBJMOC = moc_clock.o ####### 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)$(TARGET) $(DESTDIR)$(TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC) $(SUBLIBS) $(SYSCONF_LINK) $(LFLAGS) -o $(DESTDIR)$(TARGET) $(OBJECTS) $(OBJMOC) $(LIBS) moc: $(SRCMOC) tmake: tmake clock.pro 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 clock.o: clock.cpp \ clock.h \ - $(QPEDIR)/include/qpe/qpeapplication.h \ - $(QPEDIR)/include/qpe/qcopenvelope_qws.h \ - $(QPEDIR)/include/qpe/config.h \ - $(QPEDIR)/include/qpe/timestring.h + $(OPIEDIR)/include/qpe/qpeapplication.h \ + $(OPIEDIR)/include/qpe/qcopenvelope_qws.h \ + $(OPIEDIR)/include/qpe/config.h \ + $(OPIEDIR)/include/qpe/timestring.h main.o: main.cpp \ clock.h \ - $(QPEDIR)/include/qpe/qpeapplication.h + $(OPIEDIR)/include/qpe/qpeapplication.h moc_clock.o: moc_clock.cpp \ clock.h moc_clock.cpp: clock.h $(MOC) clock.h -o moc_clock.cpp diff --git a/noncore/tools/clock/clock.pro b/noncore/tools/clock/clock.pro index 97f4d2c..ec27adc 100644 --- a/noncore/tools/clock/clock.pro +++ b/noncore/tools/clock/clock.pro @@ -1,13 +1,13 @@ TEMPLATE = app CONFIG = qt warn_on release -DESTDIR = $(QPEDIR)/bin +DESTDIR = $(OPIEDIR)/bin HEADERS = clock.h SOURCES = clock.cpp \ main.cpp -INCLUDEPATH += $(QPEDIR)/include -DEPENDPATH += $(QPEDIR)/include +INCLUDEPATH += $(OPIEDIR)/include +DEPENDPATH += $(OPIEDIR)/include LIBS += -lqpe INTERFACES = TARGET = clock TRANSLATIONS = ../i18n/de/clock.ts |