-rw-r--r-- | noncore/settings/sysinfo/Makefile.in | 12 | ||||
-rw-r--r-- | noncore/settings/sysinfo/sysinfo.pro | 6 |
2 files changed, 9 insertions, 9 deletions
diff --git a/noncore/settings/sysinfo/Makefile.in b/noncore/settings/sysinfo/Makefile.in index 1149304..fb9d15e 100644 --- a/noncore/settings/sysinfo/Makefile.in +++ b/noncore/settings/sysinfo/Makefile.in @@ -1,65 +1,65 @@ ############################################################################# ####### 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 = sysinfo TARGET1 = lib$(TARGET).so.$(VER_MAJ) ####### Files HEADERS = memory.h \ graph.h \ load.h \ storage.h \ versioninfo.h \ sysinfo.h SOURCES = main.cpp \ memory.cpp \ graph.cpp \ load.cpp \ storage.cpp \ versioninfo.cpp \ sysinfo.cpp OBJECTS = main.o \ memory.o \ graph.o \ load.o \ storage.o \ versioninfo.o \ sysinfo.o INTERFACES = UICDECLS = UICIMPLS = SRCMOC = moc_memory.cpp \ moc_graph.cpp \ moc_load.cpp \ moc_storage.cpp \ moc_versioninfo.cpp \ moc_sysinfo.cpp OBJMOC = moc_memory.o \ moc_graph.o \ moc_load.o \ moc_storage.o \ moc_versioninfo.o \ moc_sysinfo.o ####### Implicit rules .SUFFIXES: .cpp .cxx .cc .C .c @@ -80,114 +80,114 @@ OBJMOC = moc_memory.o \ $(CC) -c $(CFLAGS) $(INCPATH) -o $@ $< ####### Build rules all: $(DESTDIR)$(TARGET) $(DESTDIR)$(TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC) $(SUBLIBS) $(SYSCONF_LINK) $(LFLAGS) -o $(DESTDIR)$(TARGET) $(OBJECTS) $(OBJMOC) $(LIBS) moc: $(SRCMOC) tmake: tmake sysinfo.pro clean: -rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS) -rm -f *~ core -rm -f allmoc.cpp ####### Extension Modules listpromodules: @echo listallmodules: @echo listaddonpromodules: @echo listaddonentmodules: @echo REQUIRES= ####### Sub-libraries ###### Combined headers ####### Compile main.o: main.cpp \ sysinfo.h \ - $(QPEDIR)/include/qpe/qpeapplication.h + $(OPIEDIR)/include/qpe/qpeapplication.h memory.o: memory.cpp \ graph.h \ memory.h graph.o: graph.cpp \ graph.h load.o: load.cpp \ load.h storage.o: storage.cpp \ graph.h \ storage.h versioninfo.o: versioninfo.cpp \ - $(QPEDIR)/include/qpe/resource.h \ - $(QPEDIR)/include/qpe/version.h \ + $(OPIEDIR)/include/qpe/resource.h \ + $(OPIEDIR)/include/qpe/version.h \ versioninfo.h sysinfo.o: sysinfo.cpp \ memory.h \ load.h \ storage.h \ versioninfo.h \ sysinfo.h \ - $(QPEDIR)/include/qpe/resource.h + $(OPIEDIR)/include/qpe/resource.h moc_memory.o: moc_memory.cpp \ memory.h moc_graph.o: moc_graph.cpp \ graph.h moc_load.o: moc_load.cpp \ load.h moc_storage.o: moc_storage.cpp \ storage.h moc_versioninfo.o: moc_versioninfo.cpp \ versioninfo.h moc_sysinfo.o: moc_sysinfo.cpp \ sysinfo.h moc_memory.cpp: memory.h $(MOC) memory.h -o moc_memory.cpp moc_graph.cpp: graph.h $(MOC) graph.h -o moc_graph.cpp moc_load.cpp: load.h $(MOC) load.h -o moc_load.cpp moc_storage.cpp: storage.h $(MOC) storage.h -o moc_storage.cpp moc_versioninfo.cpp: versioninfo.h $(MOC) versioninfo.h -o moc_versioninfo.cpp moc_sysinfo.cpp: sysinfo.h $(MOC) sysinfo.h -o moc_sysinfo.cpp diff --git a/noncore/settings/sysinfo/sysinfo.pro b/noncore/settings/sysinfo/sysinfo.pro index 0c7d907..3393a12 100644 --- a/noncore/settings/sysinfo/sysinfo.pro +++ b/noncore/settings/sysinfo/sysinfo.pro @@ -1,25 +1,25 @@ TEMPLATE = app CONFIG = qt warn_on release -DESTDIR = $(QPEDIR)/bin +DESTDIR = $(OPIEDIR)/bin HEADERS = memory.h \ graph.h \ load.h \ storage.h \ versioninfo.h \ sysinfo.h SOURCES = main.cpp \ memory.cpp \ graph.cpp \ load.cpp \ storage.cpp \ versioninfo.cpp \ sysinfo.cpp INTERFACES = -INCLUDEPATH += $(QPEDIR)/include -DEPENDPATH += $(QPEDIR)/include +INCLUDEPATH += $(OPIEDIR)/include +DEPENDPATH += $(OPIEDIR)/include LIBS += -lqpe TARGET = sysinfo TRANSLATIONS = ../i18n/de/sysinfo.ts |