Fixed depend and include paths.

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/jumpx
parent: 6a082e4d5206fd33f84ca90d3b1afda920bf6167 (diff)
download: opie-becb01296c8f5e19e9fd4512fe165bc8cab3a51f.zip
opie-becb01296c8f5e19e9fd4512fe165bc8cab3a51f.tar.gz
opie-becb01296c8f5e19e9fd4512fe165bc8cab3a51f.tar.bz2
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
+tmake:
+        tmake jumpx.pro
-Makefile.in: jumpx.pro
-        tmake jumpx.pro -o Makefile.in
 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 \
+                $(OPIEDIR)/include/qpe/inputmethodinterface.h \
-                ../../include/qpe/qcom.h \
+                $(OPIEDIR)/include/qpe/qcom.h \
-                ../../include/qpe/quuid.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
+INCLUDEPATH += $(OPIEDIR)/include
-DEPENDPATH     += ../../include/qpe
+DEPENDPATH      += $(OPIEDIR)/include
 LIBS           += -lqpe
 VERSION         = 1.0.0
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/jumpx
parent	6a082e4d5206fd33f84ca90d3b1afda920bf6167 (diff)
download	opie-becb01296c8f5e19e9fd4512fe165bc8cab3a51f.zip opie-becb01296c8f5e19e9fd4512fe165bc8cab3a51f.tar.gz opie-becb01296c8f5e19e9fd4512fe165bc8cab3a51f.tar.bz2

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)
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)
@@ -65,10 +65,8 @@ $(DESTDIR)$(SYSCONF_LINK_TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC) $(SUBLIBS)
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)
@@ -103,14 +101,14 @@ REQUIRES=
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


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 \
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