author | kergoth <kergoth> | 2002-01-28 23:28:04 (UTC) |
---|---|---|
committer | kergoth <kergoth> | 2002-01-28 23:28:04 (UTC) |
commit | f7b3193e5d2d9a211ce0b963dca571d82adecb71 (patch) (unidiff) | |
tree | 44f49bdc076dc299bba1a4dc8d5d517114be5701 /noncore/games/tetrix | |
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/games/tetrix/Makefile.in | 6 | ||||
-rw-r--r-- | noncore/games/tetrix/tetrix.pro | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/noncore/games/tetrix/Makefile.in b/noncore/games/tetrix/Makefile.in index 3a74fdc..59e172c 100644 --- a/noncore/games/tetrix/Makefile.in +++ b/noncore/games/tetrix/Makefile.in | |||
@@ -1,57 +1,57 @@ | |||
1 | ############################################################################# | 1 | ############################################################################# |
2 | 2 | ||
3 | ####### Compiler, tools and options | 3 | ####### Compiler, tools and options |
4 | 4 | ||
5 | CXX =$(SYSCONF_CXX) $(QT_CXX_MT) | 5 | CXX =$(SYSCONF_CXX) $(QT_CXX_MT) |
6 | CXXFLAGS=$(SYSCONF_CXXFLAGS_QT) $(SYSCONF_CXXFLAGS) | 6 | CXXFLAGS=$(SYSCONF_CXXFLAGS_QT) $(SYSCONF_CXXFLAGS) |
7 | CC =$(SYSCONF_CC) $(QT_C_MT) | 7 | CC =$(SYSCONF_CC) $(QT_C_MT) |
8 | CFLAGS =$(SYSCONF_CFLAGS) | 8 | CFLAGS =$(SYSCONF_CFLAGS) |
9 | INCPATH =-I$(QPEDIR)/include | 9 | INCPATH =-I$(OPIEDIR)/include |
10 | LFLAGS =$(SYSCONF_LFLAGS_QT) $(SYSCONF_RPATH_QT) $(SYSCONF_LFLAGS) $(QT_LFLAGS_MT) | 10 | LFLAGS =$(SYSCONF_LFLAGS_QT) $(SYSCONF_RPATH_QT) $(SYSCONF_LFLAGS) $(QT_LFLAGS_MT) |
11 | LIBS =$(SUBLIBS) -lqpe $(SYSCONF_LIBS_QT) $(SYSCONF_LIBS) $(SYSCONF_LIBS_QTAPP) | 11 | LIBS =$(SUBLIBS) -lqpe $(SYSCONF_LIBS_QT) $(SYSCONF_LIBS) $(SYSCONF_LIBS_QTAPP) |
12 | MOC =$(SYSCONF_MOC) | 12 | MOC =$(SYSCONF_MOC) |
13 | UIC =$(SYSCONF_UIC) | 13 | UIC =$(SYSCONF_UIC) |
14 | 14 | ||
15 | ####### Target | 15 | ####### Target |
16 | 16 | ||
17 | DESTDIR = ../bin/ | 17 | DESTDIR = ../bin/ |
18 | VER_MAJ = 1 | 18 | VER_MAJ = 1 |
19 | VER_MIN = 0 | 19 | VER_MIN = 0 |
20 | VER_PATCH = 0 | 20 | VER_PATCH = 0 |
21 | TARGET= tetrix | 21 | TARGET= tetrix |
22 | TARGET1 = lib$(TARGET).so.$(VER_MAJ) | 22 | TARGET1 = lib$(TARGET).so.$(VER_MAJ) |
23 | 23 | ||
24 | ####### Files | 24 | ####### Files |
25 | 25 | ||
26 | HEADERS =minefield.h \ | 26 | HEADERS =minefield.h \ |
27 | gtetrix.h \ | 27 | gtetrix.h \ |
28 | qtetrix.h \ | 28 | qtetrix.h \ |
29 | qtetrixb.h \ | 29 | qtetrixb.h \ |
30 | tpiece.h | 30 | tpiece.h |
31 | SOURCES =main.cpp \ | 31 | SOURCES =main.cpp \ |
32 | gtetrix.cpp \ | 32 | gtetrix.cpp \ |
33 | qtetrix.cpp \ | 33 | qtetrix.cpp \ |
34 | qtetrixb.cpp \ | 34 | qtetrixb.cpp \ |
35 | tpiece.cpp | 35 | tpiece.cpp |
36 | OBJECTS =main.o \ | 36 | OBJECTS =main.o \ |
37 | gtetrix.o \ | 37 | gtetrix.o \ |
38 | qtetrix.o \ | 38 | qtetrix.o \ |
39 | qtetrixb.o \ | 39 | qtetrixb.o \ |
40 | tpiece.o | 40 | tpiece.o |
41 | INTERFACES = | 41 | INTERFACES = |
42 | UICDECLS = | 42 | UICDECLS = |
43 | UICIMPLS = | 43 | UICIMPLS = |
44 | SRCMOC =moc_qtetrix.cpp \ | 44 | SRCMOC =moc_qtetrix.cpp \ |
45 | moc_qtetrixb.cpp | 45 | moc_qtetrixb.cpp |
46 | OBJMOC =moc_qtetrix.o \ | 46 | OBJMOC =moc_qtetrix.o \ |
47 | moc_qtetrixb.o | 47 | moc_qtetrixb.o |
48 | 48 | ||
49 | 49 | ||
50 | ####### Implicit rules | 50 | ####### Implicit rules |
51 | 51 | ||
52 | .SUFFIXES: .cpp .cxx .cc .C .c | 52 | .SUFFIXES: .cpp .cxx .cc .C .c |
53 | 53 | ||
54 | .cpp.o: | 54 | .cpp.o: |
55 | $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $< | 55 | $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $< |
56 | 56 | ||
57 | .cxx.o: | 57 | .cxx.o: |
@@ -70,88 +70,88 @@ OBJMOC = moc_qtetrix.o \ | |||
70 | 70 | ||
71 | 71 | ||
72 | all: $(DESTDIR)$(TARGET) | 72 | all: $(DESTDIR)$(TARGET) |
73 | 73 | ||
74 | $(DESTDIR)$(TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC) $(SUBLIBS) | 74 | $(DESTDIR)$(TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC) $(SUBLIBS) |
75 | $(SYSCONF_LINK) $(LFLAGS) -o $(DESTDIR)$(TARGET) $(OBJECTS) $(OBJMOC) $(LIBS) | 75 | $(SYSCONF_LINK) $(LFLAGS) -o $(DESTDIR)$(TARGET) $(OBJECTS) $(OBJMOC) $(LIBS) |
76 | 76 | ||
77 | moc: $(SRCMOC) | 77 | moc: $(SRCMOC) |
78 | 78 | ||
79 | tmake: | 79 | tmake: |
80 | tmake tetrix.pro | 80 | tmake tetrix.pro |
81 | 81 | ||
82 | clean: | 82 | clean: |
83 | -rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS) | 83 | -rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS) |
84 | -rm -f *~ core | 84 | -rm -f *~ core |
85 | -rm -f allmoc.cpp | 85 | -rm -f allmoc.cpp |
86 | 86 | ||
87 | ####### Extension Modules | 87 | ####### Extension Modules |
88 | 88 | ||
89 | listpromodules: | 89 | listpromodules: |
90 | @echo | 90 | @echo |
91 | 91 | ||
92 | listallmodules: | 92 | listallmodules: |
93 | @echo | 93 | @echo |
94 | 94 | ||
95 | listaddonpromodules: | 95 | listaddonpromodules: |
96 | @echo | 96 | @echo |
97 | 97 | ||
98 | listaddonentmodules: | 98 | listaddonentmodules: |
99 | @echo | 99 | @echo |
100 | 100 | ||
101 | 101 | ||
102 | REQUIRES= | 102 | REQUIRES= |
103 | 103 | ||
104 | ####### Sub-libraries | 104 | ####### Sub-libraries |
105 | 105 | ||
106 | 106 | ||
107 | ###### Combined headers | 107 | ###### Combined headers |
108 | 108 | ||
109 | 109 | ||
110 | 110 | ||
111 | ####### Compile | 111 | ####### Compile |
112 | 112 | ||
113 | main.o: main.cpp \ | 113 | main.o: main.cpp \ |
114 | qtetrix.h \ | 114 | qtetrix.h \ |
115 | qtetrixb.h \ | 115 | qtetrixb.h \ |
116 | gtetrix.h \ | 116 | gtetrix.h \ |
117 | tpiece.h \ | 117 | tpiece.h \ |
118 | $(QPEDIR)/include/qpe/qpeapplication.h | 118 | $(OPIEDIR)/include/qpe/qpeapplication.h |
119 | 119 | ||
120 | gtetrix.o: gtetrix.cpp \ | 120 | gtetrix.o: gtetrix.cpp \ |
121 | gtetrix.h \ | 121 | gtetrix.h \ |
122 | tpiece.h | 122 | tpiece.h |
123 | 123 | ||
124 | qtetrix.o: qtetrix.cpp \ | 124 | qtetrix.o: qtetrix.cpp \ |
125 | qtetrix.h \ | 125 | qtetrix.h \ |
126 | qtetrixb.h \ | 126 | qtetrixb.h \ |
127 | gtetrix.h \ | 127 | gtetrix.h \ |
128 | tpiece.h \ | 128 | tpiece.h \ |
129 | $(QPEDIR)/include/qpe/resource.h | 129 | $(OPIEDIR)/include/qpe/resource.h |
130 | 130 | ||
131 | qtetrixb.o: qtetrixb.cpp \ | 131 | qtetrixb.o: qtetrixb.cpp \ |
132 | qtetrixb.h \ | 132 | qtetrixb.h \ |
133 | gtetrix.h \ | 133 | gtetrix.h \ |
134 | tpiece.h \ | 134 | tpiece.h \ |
135 | qtetrix.h | 135 | qtetrix.h |
136 | 136 | ||
137 | tpiece.o: tpiece.cpp \ | 137 | tpiece.o: tpiece.cpp \ |
138 | tpiece.h | 138 | tpiece.h |
139 | 139 | ||
140 | moc_qtetrix.o: moc_qtetrix.cpp \ | 140 | moc_qtetrix.o: moc_qtetrix.cpp \ |
141 | qtetrix.h \ | 141 | qtetrix.h \ |
142 | qtetrixb.h \ | 142 | qtetrixb.h \ |
143 | gtetrix.h \ | 143 | gtetrix.h \ |
144 | tpiece.h | 144 | tpiece.h |
145 | 145 | ||
146 | moc_qtetrixb.o: moc_qtetrixb.cpp \ | 146 | moc_qtetrixb.o: moc_qtetrixb.cpp \ |
147 | qtetrixb.h \ | 147 | qtetrixb.h \ |
148 | gtetrix.h \ | 148 | gtetrix.h \ |
149 | tpiece.h | 149 | tpiece.h |
150 | 150 | ||
151 | moc_qtetrix.cpp: qtetrix.h | 151 | moc_qtetrix.cpp: qtetrix.h |
152 | $(MOC) qtetrix.h -o moc_qtetrix.cpp | 152 | $(MOC) qtetrix.h -o moc_qtetrix.cpp |
153 | 153 | ||
154 | moc_qtetrixb.cpp: qtetrixb.h | 154 | moc_qtetrixb.cpp: qtetrixb.h |
155 | $(MOC) qtetrixb.h -o moc_qtetrixb.cpp | 155 | $(MOC) qtetrixb.h -o moc_qtetrixb.cpp |
156 | 156 | ||
157 | 157 | ||
diff --git a/noncore/games/tetrix/tetrix.pro b/noncore/games/tetrix/tetrix.pro index 1160585..533fab0 100644 --- a/noncore/games/tetrix/tetrix.pro +++ b/noncore/games/tetrix/tetrix.pro | |||
@@ -1,17 +1,17 @@ | |||
1 | TEMPLATE= app | 1 | TEMPLATE= app |
2 | CONFIG = qt warn_on release | 2 | CONFIG = qt warn_on release |
3 | DESTDIR = ../bin | 3 | DESTDIR = ../bin |
4 | HEADERS = minefield.h \ | 4 | HEADERS = minefield.h \ |
5 | gtetrix.h \ | 5 | gtetrix.h \ |
6 | qtetrix.h \ | 6 | qtetrix.h \ |
7 | qtetrixb.h \ | 7 | qtetrixb.h \ |
8 | tpiece.h | 8 | tpiece.h |
9 | SOURCES = main.cpp \ | 9 | SOURCES = main.cpp \ |
10 | gtetrix.cpp \ | 10 | gtetrix.cpp \ |
11 | qtetrix.cpp \ | 11 | qtetrix.cpp \ |
12 | qtetrixb.cpp \ | 12 | qtetrixb.cpp \ |
13 | tpiece.cpp | 13 | tpiece.cpp |
14 | INCLUDEPATH += $(QPEDIR)/include | 14 | INCLUDEPATH += $(OPIEDIR)/include |
15 | DEPENDPATH+= $(QPEDIR)/include | 15 | DEPENDPATH+= $(OPIEDIR)/include |
16 | LIBS += -lqpe | 16 | LIBS += -lqpe |
17 | INTERFACES= | 17 | INTERFACES= |