summaryrefslogtreecommitdiff
authorllornkcor <llornkcor>2002-02-24 17:09:38 (UTC)
committer llornkcor <llornkcor>2002-02-24 17:09:38 (UTC)
commit8b61e69b52e8bb046f23d8dea734edcdc90e805e (patch) (side-by-side diff)
tree9dc5ae304cebf0c8b3f303480d5749465e3c680e
parentf39b6cfe0cccca9dac39b4b15cfe076426d5a4c5 (diff)
downloadopie-8b61e69b52e8bb046f23d8dea734edcdc90e805e.zip
opie-8b61e69b52e8bb046f23d8dea734edcdc90e805e.tar.gz
opie-8b61e69b52e8bb046f23d8dea734edcdc90e805e.tar.bz2
updated Makefile.in
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/apps/textedit/Makefile.in103
-rw-r--r--core/apps/textedit/opie-textedit.control2
-rw-r--r--noncore/unsupported/filebrowser/Makefile.in48
3 files changed, 101 insertions, 52 deletions
diff --git a/core/apps/textedit/Makefile.in b/core/apps/textedit/Makefile.in
index 06fdb77..034157f 100644
--- a/core/apps/textedit/Makefile.in
+++ b/core/apps/textedit/Makefile.in
@@ -1,187 +1,218 @@
#############################################################################
####### 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$(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 = $(OPIEDIR)/bin/
VER_MAJ = 1
VER_MIN = 0
VER_PATCH = 0
TARGET = textedit
TARGET1 = lib$(TARGET).so.$(VER_MAJ)
####### Files
HEADERS = textedit.h \
fileBrowser.h \
fontDialog.h \
- fileSaver.h
+ fileSaver.h \
+ filePermissions.h
SOURCES = main.cpp \
textedit.cpp \
fileBrowser.cpp \
fontDialog.cpp \
- fileSaver.cpp
+ fileSaver.cpp \
+ filePermissions.cpp
OBJECTS = main.o \
textedit.o \
fileBrowser.o \
fontDialog.o \
- fileSaver.o
+ fileSaver.o \
+ filePermissions.o
INTERFACES =
UICDECLS =
UICIMPLS =
SRCMOC = moc_textedit.cpp \
moc_fileBrowser.cpp \
moc_fontDialog.cpp \
- moc_fileSaver.cpp
+ moc_fileSaver.cpp \
+ moc_filePermissions.cpp
OBJMOC = moc_textedit.o \
moc_fileBrowser.o \
moc_fontDialog.o \
- moc_fileSaver.o
+ moc_fileSaver.o \
+ moc_filePermissions.o
####### Implicit rules
.SUFFIXES: .cpp .cxx .cc .C .c
.cpp.o:
$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
.cxx.o:
$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
.cc.o:
$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
.C.o:
$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
.c.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 textedit.pro
+tmake: Makefile.in
+
+Makefile.in: textedit.pro
+ tmake textedit.pro -o Makefile.in
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 \
textedit.h \
- $(OPIEDIR)/include/qpe/filemanager.h \
- $(OPIEDIR)/include/qpe/qpeapplication.h
+ fileBrowser.h \
+ fileSaver.h \
+ /usr/src/oldsrc/Opie/opie/include/qpe/filemanager.h \
+ /usr/src/oldsrc/Opie/opie/include/qpe/qpeapplication.h \
+ /usr/src/oldsrc/Opie/opie/include/qpedecoration_qws.h \
+ /usr/src/oldsrc/Opie/opie/include/timestring.h
textedit.o: textedit.cpp \
textedit.h \
- $(OPIEDIR)/include/qpe/filemanager.h \
fileBrowser.h \
fileSaver.h \
+ /usr/src/oldsrc/Opie/opie/include/qpe/filemanager.h \
+ filePermissions.h \
fontDialog.h \
- $(OPIEDIR)/include/qpe/fontdatabase.h \
- $(OPIEDIR)/include/qpe/fontfactoryinterface.h \
- $(OPIEDIR)/include/qpe/qcom.h \
- $(OPIEDIR)/include/qpe/quuid.h \
- $(OPIEDIR)/include/qpe/global.h \
- $(OPIEDIR)/include/qpe/fileselector.h \
- $(OPIEDIR)/include/qpe/applnk.h \
- $(OPIEDIR)/include/qpe/resource.h \
- $(OPIEDIR)/include/qpe/config.h \
- $(OPIEDIR)/include/qpe/qpeapplication.h \
- $(OPIEDIR)/include/qpe/qpemenubar.h \
- $(OPIEDIR)/include/qpe/qpetoolbar.h
+ /usr/src/oldsrc/Opie/opie/include/qpe/fontdatabase.h \
+ /usr/src/oldsrc/Opie/opie/include/qpe/fontfactoryinterface.h \
+ /usr/src/oldsrc/Opie/opie/include/qpe/qcom.h \
+ /usr/src/oldsrc/Opie/opie/include/qpe/quuid.h \
+ /usr/src/oldsrc/Opie/opie/include/qpe/global.h \
+ /usr/src/oldsrc/Opie/opie/include/qpe/fileselector.h \
+ /usr/src/oldsrc/Opie/opie/include/filemanager.h \
+ /usr/src/oldsrc/Opie/opie/include/applnk.h \
+ /usr/src/oldsrc/Opie/opie/include/qpe/applnk.h \
+ /usr/src/oldsrc/Opie/opie/include/qpe/resource.h \
+ /usr/src/oldsrc/Opie/opie/include/qpe/config.h \
+ /usr/src/oldsrc/Opie/opie/include/qpe/qpeapplication.h \
+ /usr/src/oldsrc/Opie/opie/include/qpedecoration_qws.h \
+ /usr/src/oldsrc/Opie/opie/include/timestring.h \
+ /usr/src/oldsrc/Opie/opie/include/qpe/qpemenubar.h \
+ /usr/src/oldsrc/Opie/opie/include/qpe/qpetoolbar.h
fileBrowser.o: fileBrowser.cpp \
fileBrowser.h \
- $(OPIEDIR)/include/qpe/config.h
+ /usr/src/oldsrc/Opie/opie/include/qpe/config.h
fontDialog.o: fontDialog.cpp \
fontDialog.h \
- $(OPIEDIR)/include/qpe/fontdatabase.h \
- $(OPIEDIR)/include/qpe/fontfactoryinterface.h \
- $(OPIEDIR)/include/qpe/qcom.h \
- $(OPIEDIR)/include/qpe/quuid.h \
- $(OPIEDIR)/include/qpe/config.h \
- $(OPIEDIR)/include/qpe/qpeapplication.h
+ /usr/src/oldsrc/Opie/opie/include/qpe/fontdatabase.h \
+ /usr/src/oldsrc/Opie/opie/include/qpe/fontfactoryinterface.h \
+ /usr/src/oldsrc/Opie/opie/include/qpe/qcom.h \
+ /usr/src/oldsrc/Opie/opie/include/qpe/quuid.h \
+ /usr/src/oldsrc/Opie/opie/include/qpe/config.h \
+ /usr/src/oldsrc/Opie/opie/include/qpe/qpeapplication.h \
+ /usr/src/oldsrc/Opie/opie/include/qpedecoration_qws.h \
+ /usr/src/oldsrc/Opie/opie/include/timestring.h
fileSaver.o: fileSaver.cpp \
fileSaver.h \
- $(OPIEDIR)/include/qpe/config.h \
- $(OPIEDIR)/include/qpe/qpeapplication.h
+ /usr/src/oldsrc/Opie/opie/include/qpe/config.h \
+ /usr/src/oldsrc/Opie/opie/include/qpe/qpeapplication.h \
+ /usr/src/oldsrc/Opie/opie/include/qpedecoration_qws.h \
+ /usr/src/oldsrc/Opie/opie/include/timestring.h
+
+filePermissions.o: filePermissions.cpp \
+ filePermissions.h
moc_textedit.o: moc_textedit.cpp \
textedit.h \
- $(OPIEDIR)/include/qpe/filemanager.h
+ fileBrowser.h \
+ fileSaver.h \
+ /usr/src/oldsrc/Opie/opie/include/qpe/filemanager.h
moc_fileBrowser.o: moc_fileBrowser.cpp \
fileBrowser.h
moc_fontDialog.o: moc_fontDialog.cpp \
fontDialog.h \
- $(OPIEDIR)/include/qpe/fontdatabase.h \
- $(OPIEDIR)/include/qpe/fontfactoryinterface.h \
- $(OPIEDIR)/include/qpe/qcom.h \
- $(OPIEDIR)/include/qpe/quuid.h
+ /usr/src/oldsrc/Opie/opie/include/qpe/fontdatabase.h \
+ /usr/src/oldsrc/Opie/opie/include/qpe/fontfactoryinterface.h \
+ /usr/src/oldsrc/Opie/opie/include/qpe/qcom.h \
+ /usr/src/oldsrc/Opie/opie/include/qpe/quuid.h
moc_fileSaver.o: moc_fileSaver.cpp \
fileSaver.h
+moc_filePermissions.o: moc_filePermissions.cpp \
+ filePermissions.h
+
moc_textedit.cpp: textedit.h
$(MOC) textedit.h -o moc_textedit.cpp
moc_fileBrowser.cpp: fileBrowser.h
$(MOC) fileBrowser.h -o moc_fileBrowser.cpp
moc_fontDialog.cpp: fontDialog.h
$(MOC) fontDialog.h -o moc_fontDialog.cpp
moc_fileSaver.cpp: fileSaver.h
$(MOC) fileSaver.h -o moc_fileSaver.cpp
+moc_filePermissions.cpp: filePermissions.h
+ $(MOC) filePermissions.h -o moc_filePermissions.cpp
+
diff --git a/core/apps/textedit/opie-textedit.control b/core/apps/textedit/opie-textedit.control
index 55fc644..4990466 100644
--- a/core/apps/textedit/opie-textedit.control
+++ b/core/apps/textedit/opie-textedit.control
@@ -1,9 +1,9 @@
Files: bin/textedit apps/Applications/textedit.desktop
Priority: optional
Section: opie/applications
Maintainer: Warwick Allison <warwick@trolltech.com>
Architecture: arm
Version: $QPE_VERSION-$SUB_VERSION
Depends: opie-base ($QPE_VERSION)
Description: Text Editor
- The (slightly enchanced) text editor for the Opie environment.
+ The text editor for the Opie environment.
diff --git a/noncore/unsupported/filebrowser/Makefile.in b/noncore/unsupported/filebrowser/Makefile.in
index d1f80b7..d964f79 100644
--- a/noncore/unsupported/filebrowser/Makefile.in
+++ b/noncore/unsupported/filebrowser/Makefile.in
@@ -1,138 +1,156 @@
#############################################################################
####### 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$(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 = $(OPIEDIR)/bin/
VER_MAJ = 1
VER_MIN = 0
VER_PATCH = 0
TARGET = filebrowser
TARGET1 = lib$(TARGET).so.$(VER_MAJ)
####### Files
HEADERS = inlineedit.h \
- filebrowser.h
+ filebrowser.h \
+ filePermissions.h
SOURCES = filebrowser.cpp \
inlineedit.cpp \
+ filePermissions.cpp \
main.cpp
OBJECTS = filebrowser.o \
inlineedit.o \
+ filePermissions.o \
main.o
INTERFACES =
UICDECLS =
UICIMPLS =
SRCMOC = moc_inlineedit.cpp \
- moc_filebrowser.cpp
+ moc_filebrowser.cpp \
+ moc_filePermissions.cpp
OBJMOC = moc_inlineedit.o \
- moc_filebrowser.o
+ moc_filebrowser.o \
+ moc_filePermissions.o
####### Implicit rules
.SUFFIXES: .cpp .cxx .cc .C .c
.cpp.o:
$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
.cxx.o:
$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
.cc.o:
$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
.C.o:
$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
.c.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 filebrowser.pro
+tmake: Makefile.in
+
+Makefile.in: filebrowser.pro
+ tmake filebrowser.pro -o Makefile.in
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
filebrowser.o: filebrowser.cpp \
inlineedit.h \
filebrowser.h \
- $(OPIEDIR)/include/qpe/resource.h \
- $(OPIEDIR)/include/qpe/global.h \
- $(OPIEDIR)/include/qpe/mimetype.h \
- $(OPIEDIR)/include/qpe/applnk.h \
- $(OPIEDIR)/include/qpe/qpetoolbar.h \
- $(OPIEDIR)/include/qpe/qpemenubar.h
+ filePermissions.h \
+ /usr/src/oldsrc/Opie/opie/include/qpe/resource.h \
+ /usr/src/oldsrc/Opie/opie/include/qpe/global.h \
+ /usr/src/oldsrc/Opie/opie/include/qpe/mimetype.h \
+ /usr/src/oldsrc/Opie/opie/include/qpe/applnk.h \
+ /usr/src/oldsrc/Opie/opie/include/qcopenvelope_qws.h \
+ /usr/src/oldsrc/Opie/opie/include/qpe/qpetoolbar.h \
+ /usr/src/oldsrc/Opie/opie/include/qpe/qpemenubar.h
inlineedit.o: inlineedit.cpp \
inlineedit.h
+filePermissions.o: filePermissions.cpp \
+ filePermissions.h
+
main.o: main.cpp \
filebrowser.h \
- $(OPIEDIR)/include/qpe/qpeapplication.h \
- $(OPIEDIR)/include/qpedecoration_qws.h \
- $(OPIEDIR)/include/timestring.h \
- $(OPIEDIR)/include/qpe/mimetype.h
+ /usr/src/oldsrc/Opie/opie/include/qpe/qpeapplication.h \
+ /usr/src/oldsrc/Opie/opie/include/qpedecoration_qws.h \
+ /usr/src/oldsrc/Opie/opie/include/timestring.h \
+ /usr/src/oldsrc/Opie/opie/include/qpe/mimetype.h
moc_inlineedit.o: moc_inlineedit.cpp \
inlineedit.h
moc_filebrowser.o: moc_filebrowser.cpp \
filebrowser.h
+moc_filePermissions.o: moc_filePermissions.cpp \
+ filePermissions.h
+
moc_inlineedit.cpp: inlineedit.h
$(MOC) inlineedit.h -o moc_inlineedit.cpp
moc_filebrowser.cpp: filebrowser.h
$(MOC) filebrowser.h -o moc_filebrowser.cpp
+moc_filePermissions.cpp: filePermissions.h
+ $(MOC) filePermissions.h -o moc_filePermissions.cpp
+