summaryrefslogtreecommitdiff
authorkergoth <kergoth>2002-02-05 16:07:58 (UTC)
committer kergoth <kergoth>2002-02-05 16:07:58 (UTC)
commitbecb01296c8f5e19e9fd4512fe165bc8cab3a51f (patch) (side-by-side diff)
tree313d0680427def8bc563628798d49e5886775809
parent6a082e4d5206fd33f84ca90d3b1afda920bf6167 (diff)
downloadopie-becb01296c8f5e19e9fd4512fe165bc8cab3a51f.zip
opie-becb01296c8f5e19e9fd4512fe165bc8cab3a51f.tar.gz
opie-becb01296c8f5e19e9fd4512fe165bc8cab3a51f.tar.bz2
Fixed depend and include paths.
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--inputmethods/jumpx/Makefile.in16
-rw-r--r--inputmethods/jumpx/jumpx.pro4
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
@@ -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../../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_QTAPP)
MOC = $(SYSCONF_MOC)
@@ -65,10 +65,8 @@ $(DESTDIR)$(SYSCONF_LINK_TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC) $(SUBLIBS)
moc: $(SRCMOC)
-tmake: Makefile.in
-
-Makefile.in: jumpx.pro
- tmake jumpx.pro -o Makefile.in
+tmake:
+ tmake jumpx.pro
clean:
-rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS)
@@ -103,14 +101,14 @@ REQUIRES=
keyboard.o: keyboard.cpp \
keyboard.h \
- ../../include/qpe/resource.h
+ $(OPIEDIR)/include/qpe/resource.h
keyboardimpl.o: keyboardimpl.cpp \
keyboard.h \
keyboardimpl.h \
- ../../include/qpe/inputmethodinterface.h \
- ../../include/qpe/qcom.h \
- ../../include/qpe/quuid.h
+ $(OPIEDIR)/include/qpe/inputmethodinterface.h \
+ $(OPIEDIR)/include/qpe/qcom.h \
+ $(OPIEDIR)/include/qpe/quuid.h
moc_keyboard.o: moc_keyboard.cpp \
keyboard.h
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
@@ -6,7 +6,7 @@ SOURCES = keyboard.cpp \
keyboardimpl.cpp
TARGET = qjumpx
DESTDIR = ../../plugins/inputmethods
-INCLUDEPATH += ../../include/qpe
-DEPENDPATH += ../../include/qpe
+INCLUDEPATH += $(OPIEDIR)/include
+DEPENDPATH += $(OPIEDIR)/include
LIBS += -lqpe
VERSION = 1.0.0