author | kergoth <kergoth> | 2002-02-05 16:07:58 (UTC) |
---|---|---|
committer | kergoth <kergoth> | 2002-02-05 16:07:58 (UTC) |
commit | becb01296c8f5e19e9fd4512fe165bc8cab3a51f (patch) (unidiff) | |
tree | 313d0680427def8bc563628798d49e5886775809 /inputmethods | |
parent | 6a082e4d5206fd33f84ca90d3b1afda920bf6167 (diff) | |
download | opie-becb01296c8f5e19e9fd4512fe165bc8cab3a51f.zip opie-becb01296c8f5e19e9fd4512fe165bc8cab3a51f.tar.gz opie-becb01296c8f5e19e9fd4512fe165bc8cab3a51f.tar.bz2 |
Fixed depend and include paths.
-rw-r--r-- | inputmethods/jumpx/Makefile.in | 16 | ||||
-rw-r--r-- | inputmethods/jumpx/jumpx.pro | 4 |
2 files changed, 9 insertions, 11 deletions
diff --git a/inputmethods/jumpx/Makefile.in b/inputmethods/jumpx/Makefile.in index b6347d5..0fabaa5 100644 --- a/inputmethods/jumpx/Makefile.in +++ b/inputmethods/jumpx/Makefile.in | |||
@@ -1,33 +1,33 @@ | |||
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) $(SYSCONF_CXXFLAGS_LIB) | 6 | CXXFLAGS=$(SYSCONF_CXXFLAGS_QT) $(SYSCONF_CXXFLAGS) $(SYSCONF_CXXFLAGS_LIB) |
7 | CC =$(SYSCONF_CC) $(QT_C_MT) | 7 | CC =$(SYSCONF_CC) $(QT_C_MT) |
8 | CFLAGS =$(SYSCONF_CFLAGS) $(SYSCONF_CFLAGS_LIB) | 8 | CFLAGS =$(SYSCONF_CFLAGS) $(SYSCONF_CFLAGS_LIB) |
9 | INCPATH =-I../../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_QTAPP) | 11 | LIBS =$(SUBLIBS) -lqpe $(SYSCONF_LIBS_QT) $(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 = ../../plugins/inputmethods/ | 17 | DESTDIR = ../../plugins/inputmethods/ |
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= qjumpx | 21 | TARGET= qjumpx |
22 | TARGET1 = lib$(TARGET).so.$(VER_MAJ) | 22 | TARGET1 = lib$(TARGET).so.$(VER_MAJ) |
23 | 23 | ||
24 | ####### Files | 24 | ####### Files |
25 | 25 | ||
26 | HEADERS =keyboard.h \ | 26 | HEADERS =keyboard.h \ |
27 | keyboardimpl.h | 27 | keyboardimpl.h |
28 | SOURCES =keyboard.cpp \ | 28 | SOURCES =keyboard.cpp \ |
29 | keyboardimpl.cpp | 29 | keyboardimpl.cpp |
30 | OBJECTS =keyboard.o \ | 30 | OBJECTS =keyboard.o \ |
31 | keyboardimpl.o | 31 | keyboardimpl.o |
32 | INTERFACES = | 32 | INTERFACES = |
33 | UICDECLS = | 33 | UICDECLS = |
@@ -44,78 +44,76 @@ OBJMOC = moc_keyboard.o | |||
44 | $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $< | 44 | $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $< |
45 | 45 | ||
46 | .cxx.o: | 46 | .cxx.o: |
47 | $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $< | 47 | $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $< |
48 | 48 | ||
49 | .cc.o: | 49 | .cc.o: |
50 | $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $< | 50 | $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $< |
51 | 51 | ||
52 | .C.o: | 52 | .C.o: |
53 | $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $< | 53 | $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $< |
54 | 54 | ||
55 | .c.o: | 55 | .c.o: |
56 | $(CC) -c $(CFLAGS) $(INCPATH) -o $@ $< | 56 | $(CC) -c $(CFLAGS) $(INCPATH) -o $@ $< |
57 | 57 | ||
58 | ####### Build rules | 58 | ####### Build rules |
59 | 59 | ||
60 | 60 | ||
61 | all: $(DESTDIR)$(SYSCONF_LINK_TARGET) | 61 | all: $(DESTDIR)$(SYSCONF_LINK_TARGET) |
62 | 62 | ||
63 | $(DESTDIR)$(SYSCONF_LINK_TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC) $(SUBLIBS) | 63 | $(DESTDIR)$(SYSCONF_LINK_TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC) $(SUBLIBS) |
64 | $(SYSCONF_LINK_LIB) | 64 | $(SYSCONF_LINK_LIB) |
65 | 65 | ||
66 | moc: $(SRCMOC) | 66 | moc: $(SRCMOC) |
67 | 67 | ||
68 | tmake: Makefile.in | 68 | tmake: |
69 | 69 | tmake jumpx.pro | |
70 | Makefile.in: jumpx.pro | ||
71 | tmake jumpx.pro -o Makefile.in | ||
72 | 70 | ||
73 | clean: | 71 | clean: |
74 | -rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS) | 72 | -rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS) |
75 | -rm -f *~ core | 73 | -rm -f *~ core |
76 | -rm -f allmoc.cpp | 74 | -rm -f allmoc.cpp |
77 | 75 | ||
78 | ####### Extension Modules | 76 | ####### Extension Modules |
79 | 77 | ||
80 | listpromodules: | 78 | listpromodules: |
81 | @echo | 79 | @echo |
82 | 80 | ||
83 | listallmodules: | 81 | listallmodules: |
84 | @echo | 82 | @echo |
85 | 83 | ||
86 | listaddonpromodules: | 84 | listaddonpromodules: |
87 | @echo | 85 | @echo |
88 | 86 | ||
89 | listaddonentmodules: | 87 | listaddonentmodules: |
90 | @echo | 88 | @echo |
91 | 89 | ||
92 | 90 | ||
93 | REQUIRES= | 91 | REQUIRES= |
94 | 92 | ||
95 | ####### Sub-libraries | 93 | ####### Sub-libraries |
96 | 94 | ||
97 | 95 | ||
98 | ###### Combined headers | 96 | ###### Combined headers |
99 | 97 | ||
100 | 98 | ||
101 | 99 | ||
102 | ####### Compile | 100 | ####### Compile |
103 | 101 | ||
104 | keyboard.o: keyboard.cpp \ | 102 | keyboard.o: keyboard.cpp \ |
105 | keyboard.h \ | 103 | keyboard.h \ |
106 | ../../include/qpe/resource.h | 104 | $(OPIEDIR)/include/qpe/resource.h |
107 | 105 | ||
108 | keyboardimpl.o: keyboardimpl.cpp \ | 106 | keyboardimpl.o: keyboardimpl.cpp \ |
109 | keyboard.h \ | 107 | keyboard.h \ |
110 | keyboardimpl.h \ | 108 | keyboardimpl.h \ |
111 | ../../include/qpe/inputmethodinterface.h \ | 109 | $(OPIEDIR)/include/qpe/inputmethodinterface.h \ |
112 | ../../include/qpe/qcom.h \ | 110 | $(OPIEDIR)/include/qpe/qcom.h \ |
113 | ../../include/qpe/quuid.h | 111 | $(OPIEDIR)/include/qpe/quuid.h |
114 | 112 | ||
115 | moc_keyboard.o: moc_keyboard.cpp \ | 113 | moc_keyboard.o: moc_keyboard.cpp \ |
116 | keyboard.h | 114 | keyboard.h |
117 | 115 | ||
118 | moc_keyboard.cpp: keyboard.h | 116 | moc_keyboard.cpp: keyboard.h |
119 | $(MOC) keyboard.h -o moc_keyboard.cpp | 117 | $(MOC) keyboard.h -o moc_keyboard.cpp |
120 | 118 | ||
121 | 119 | ||
diff --git a/inputmethods/jumpx/jumpx.pro b/inputmethods/jumpx/jumpx.pro index 433a798..f4699bd 100644 --- a/inputmethods/jumpx/jumpx.pro +++ b/inputmethods/jumpx/jumpx.pro | |||
@@ -1,12 +1,12 @@ | |||
1 | TEMPLATE = lib | 1 | TEMPLATE = lib |
2 | CONFIG += qt warn_on release | 2 | CONFIG += qt warn_on release |
3 | HEADERS = keyboard.h \ | 3 | HEADERS = keyboard.h \ |
4 | keyboardimpl.h | 4 | keyboardimpl.h |
5 | SOURCES = keyboard.cpp \ | 5 | SOURCES = keyboard.cpp \ |
6 | keyboardimpl.cpp | 6 | keyboardimpl.cpp |
7 | TARGET = qjumpx | 7 | TARGET = qjumpx |
8 | DESTDIR = ../../plugins/inputmethods | 8 | DESTDIR = ../../plugins/inputmethods |
9 | INCLUDEPATH += ../../include/qpe | 9 | INCLUDEPATH += $(OPIEDIR)/include |
10 | DEPENDPATH += ../../include/qpe | 10 | DEPENDPATH += $(OPIEDIR)/include |
11 | LIBS += -lqpe | 11 | LIBS += -lqpe |
12 | VERSION = 1.0.0 | 12 | VERSION = 1.0.0 |