-rw-r--r-- | noncore/multimedia/showimg/Makefile.in | 16 | ||||
-rw-r--r-- | noncore/multimedia/showimg/showimg.pro | 6 |
2 files changed, 11 insertions, 11 deletions
diff --git a/noncore/multimedia/showimg/Makefile.in b/noncore/multimedia/showimg/Makefile.in index 9255b2d..7c58da1 100644 --- a/noncore/multimedia/showimg/Makefile.in +++ b/noncore/multimedia/showimg/Makefile.in @@ -1,41 +1,41 @@ ############################################################################# ####### 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 = showimg TARGET1 = lib$(TARGET).so.$(VER_MAJ) ####### Files HEADERS = showimg.h SOURCES = main.cpp \ showimg.cpp OBJECTS = main.o \ showimg.o INTERFACES = UICDECLS = UICIMPLS = SRCMOC = moc_showimg.cpp OBJMOC = moc_showimg.o ####### Implicit rules .SUFFIXES: .cpp .cxx .cc .C .c @@ -79,41 +79,41 @@ listpromodules: listallmodules: @echo listaddonpromodules: @echo listaddonentmodules: @echo REQUIRES=showimg ####### Sub-libraries ###### Combined headers ####### Compile main.o: main.cpp \ showimg.h \ - $(QPEDIR)/include/qpe/qpeapplication.h + $(OPIEDIR)/include/qpe/qpeapplication.h showimg.o: showimg.cpp \ showimg.h \ - $(QPEDIR)/include/qpe/resource.h \ - $(QPEDIR)/include/qpe/fileselector.h \ - $(QPEDIR)/include/qpe/applnk.h \ - $(QPEDIR)/include/qpe/qpemenubar.h \ - $(QPEDIR)/include/qpe/qpetoolbar.h + $(OPIEDIR)/include/qpe/resource.h \ + $(OPIEDIR)/include/qpe/fileselector.h \ + $(OPIEDIR)/include/qpe/applnk.h \ + $(OPIEDIR)/include/qpe/qpemenubar.h \ + $(OPIEDIR)/include/qpe/qpetoolbar.h moc_showimg.o: moc_showimg.cpp \ showimg.h moc_showimg.cpp: showimg.h $(MOC) showimg.h -o moc_showimg.cpp diff --git a/noncore/multimedia/showimg/showimg.pro b/noncore/multimedia/showimg/showimg.pro index a372f62..29da458 100644 --- a/noncore/multimedia/showimg/showimg.pro +++ b/noncore/multimedia/showimg/showimg.pro @@ -1,19 +1,19 @@ TEMPLATE = app CONFIG += qt warn_on release -DESTDIR = $(QPEDIR)/bin +DESTDIR = $(OPIEDIR)/bin HEADERS = showimg.h SOURCES = main.cpp \ showimg.cpp TARGET = showimg -INCLUDEPATH += $(QPEDIR)/include -DEPENDPATH += $(QPEDIR)/include +INCLUDEPATH += $(OPIEDIR)/include +DEPENDPATH += $(OPIEDIR)/include LIBS += -lqpe REQUIRES = showimg TRANSLATIONS = ../i18n/de/showimg.ts |