summaryrefslogtreecommitdiff
authorkergoth <kergoth>2003-03-19 05:49:25 (UTC)
committer kergoth <kergoth>2003-03-19 05:49:25 (UTC)
commitc5eb709636c2f38e815696fa492ef05ad7236b61 (patch) (unidiff)
treea9e881a7bcd91ffedcc9db5f6ce7a7d422864f5b
parent234f974bea8f93213fa43bb8b501dee5db43cbdc (diff)
downloadopie-c5eb709636c2f38e815696fa492ef05ad7236b61.zip
opie-c5eb709636c2f38e815696fa492ef05ad7236b61.tar.gz
opie-c5eb709636c2f38e815696fa492ef05ad7236b61.tar.bz2
Update the makefile patch to apply against 2.3.4 final.
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--qt/qte234-for-opie091-makefile.patch101
1 files changed, 11 insertions, 90 deletions
diff --git a/qt/qte234-for-opie091-makefile.patch b/qt/qte234-for-opie091-makefile.patch
index eecd418..d5871d2 100644
--- a/qt/qte234-for-opie091-makefile.patch
+++ b/qt/qte234-for-opie091-makefile.patch
@@ -1,118 +1,39 @@
1 --- src/Makefile.in.orig2002-12-06 21:00:04.000000000 +0100 1 --- qt-2.3.4-beta5/src/Makefile.in.orig2003-01-30 19:37:44.000000000 -0800
2 +++ src/Makefile.in2002-12-06 21:02:37.000000000 +0100 2 +++ qt-2.3.4-beta5/src/Makefile.in2003-02-12 16:02:09.000000000 -0800
3@@ -6,7 +6,7 @@ 3@@ -6,7 +6,7 @@
4 CXXFLAGS=$(SYSCONF_CXXFLAGS_QT) $(SYSCONF_CXXFLAGS_X11) $(SYSCONF_CXXFLAGS) $(SYSCONF_CXXFLAGS_LIB) $(QT_CXXFLAGS_OPT) 4 CXXFLAGS=$(SYSCONF_CXXFLAGS_QT) $(SYSCONF_CXXFLAGS_X11) $(SYSCONF_CXXFLAGS) $(SYSCONF_CXXFLAGS_LIB) -DQT_NO_IMAGEIO_MNG $(QT_CXXFLAGS_OPT)
5 CC =$(SYSCONF_CC) $(QT_C_MT) 5 CC =$(SYSCONF_CC) $(QT_C_MT)
6 CFLAGS =$(SYSCONF_CFLAGS) $(SYSCONF_CFLAGS_LIB) $(QT_CFLAGS_OPT) 6 CFLAGS =$(SYSCONF_CFLAGS) $(SYSCONF_CFLAGS_LIB) -DQT_NO_IMAGEIO_MNG $(QT_CFLAGS_OPT)
7 -INCPATH =-I3rdparty/libpng -I3rdparty/zlib -I3rdparty/freetype/src -I3rdparty/freetype/include -I3rdparty/freetype/builds/unix -I3rdparty/kernel -I3rdparty/tools 7 -INCPATH =-I3rdparty/freetype/src -I3rdparty/freetype/include -I3rdparty/freetype/builds/unix -I3rdparty/kernel -I3rdparty/tools
8 +INCPATH =-I3rdparty/freetype/src -I3rdparty/freetype/include -I3rdparty/freetype/builds/unix -I3rdparty/kernel -I3rdparty/tools 8 +INCPATH =-I3rdparty/kernel -I3rdparty/tools
9 LFLAGS =$(SYSCONF_LFLAGS) $(QT_LFLAGS_MT) 9 LFLAGS =$(SYSCONF_LFLAGS) $(QT_LFLAGS_MT)
10 LIBS =$(SUBLIBS) $(SYSCONF_LIBS_QTLIB) 10 LIBS =$(SUBLIBS) $(SYSCONF_LIBS_QTLIB)
11 MOC =$(SYSCONF_MOC) 11 MOC =$(SYSCONF_MOC)
12@@ -24,104 +24,8 @@ 12@@ -44,26 +44,7 @@
13 ####### Files 13 3rdparty/freetype/src/type1/type1.c \
14 14 3rdparty/freetype/src/winfonts/winfnt.c \
15 HEADERS = 15 allmoc.cpp
16 -SOURCES =3rdparty/libpng/png.c \ 16 -OBJECTS =3rdparty/freetype/builds/unix/ftsystem.o \
17 - 3rdparty/libpng/pngerror.c \
18 - 3rdparty/libpng/pngget.c \
19 - 3rdparty/libpng/pngmem.c \
20 - 3rdparty/libpng/pngpread.c \
21 - 3rdparty/libpng/pngread.c \
22 - 3rdparty/libpng/pngrio.c \
23 - 3rdparty/libpng/pngrtran.c \
24 - 3rdparty/libpng/pngrutil.c \
25 - 3rdparty/libpng/pngset.c \
26 - 3rdparty/libpng/pngtrans.c \
27 - 3rdparty/libpng/pngwio.c \
28 - 3rdparty/libpng/pngwrite.c \
29 - 3rdparty/libpng/pngwtran.c \
30 - 3rdparty/libpng/pngwutil.c \
31 - 3rdparty/zlib/adler32.c \
32 - 3rdparty/zlib/compress.c \
33 - 3rdparty/zlib/crc32.c \
34 - 3rdparty/zlib/deflate.c \
35 - 3rdparty/zlib/gzio.c \
36 - 3rdparty/zlib/infblock.c \
37 - 3rdparty/zlib/infcodes.c \
38 - 3rdparty/zlib/inffast.c \
39 - 3rdparty/zlib/inflate.c \
40 - 3rdparty/zlib/inftrees.c \
41 - 3rdparty/zlib/infutil.c \
42 - 3rdparty/zlib/trees.c \
43 - 3rdparty/zlib/uncompr.c \
44 - 3rdparty/zlib/zutil.c \
45 - 3rdparty/freetype/builds/unix/ftsystem.c \
46 - 3rdparty/freetype/src/base/ftdebug.c \
47 - 3rdparty/freetype/src/base/ftinit.c \
48 - 3rdparty/freetype/src/base/ftbase.c \
49 - 3rdparty/freetype/src/base/ftglyph.c \
50 - 3rdparty/freetype/src/base/ftmm.c \
51 - 3rdparty/freetype/src/base/ftbbox.c \
52 - 3rdparty/freetype/src/autohint/autohint.c \
53 - 3rdparty/freetype/src/cache/ftcache.c \
54 - 3rdparty/freetype/src/cff/cff.c \
55 - 3rdparty/freetype/src/cid/type1cid.c \
56 - 3rdparty/freetype/src/psaux/psaux.c \
57 - 3rdparty/freetype/src/psnames/psmodule.c \
58 - 3rdparty/freetype/src/raster/raster.c \
59 - 3rdparty/freetype/src/sfnt/sfnt.c \
60 - 3rdparty/freetype/src/smooth/smooth.c \
61 - 3rdparty/freetype/src/truetype/truetype.c \
62 - 3rdparty/freetype/src/type1/type1.c \
63 - 3rdparty/freetype/src/winfonts/winfnt.c \
64 - allmoc.cpp
65 -OBJECTS =3rdparty/libpng/png.o \
66 - 3rdparty/libpng/pngerror.o \
67 - 3rdparty/libpng/pngget.o \
68 - 3rdparty/libpng/pngmem.o \
69 - 3rdparty/libpng/pngpread.o \
70 - 3rdparty/libpng/pngread.o \
71 - 3rdparty/libpng/pngrio.o \
72 - 3rdparty/libpng/pngrtran.o \
73 - 3rdparty/libpng/pngrutil.o \
74 - 3rdparty/libpng/pngset.o \
75 - 3rdparty/libpng/pngtrans.o \
76 - 3rdparty/libpng/pngwio.o \
77 - 3rdparty/libpng/pngwrite.o \
78 - 3rdparty/libpng/pngwtran.o \
79 - 3rdparty/libpng/pngwutil.o \
80 - 3rdparty/zlib/adler32.o \
81 - 3rdparty/zlib/compress.o \
82 - 3rdparty/zlib/crc32.o \
83 - 3rdparty/zlib/deflate.o \
84 - 3rdparty/zlib/gzio.o \
85 - 3rdparty/zlib/infblock.o \
86 - 3rdparty/zlib/infcodes.o \
87 - 3rdparty/zlib/inffast.o \
88 - 3rdparty/zlib/inflate.o \
89 - 3rdparty/zlib/inftrees.o \
90 - 3rdparty/zlib/infutil.o \
91 - 3rdparty/zlib/trees.o \
92 - 3rdparty/zlib/uncompr.o \
93 - 3rdparty/zlib/zutil.o \
94 - 3rdparty/freetype/builds/unix/ftsystem.o \
95 - 3rdparty/freetype/src/base/ftdebug.o \ 17 - 3rdparty/freetype/src/base/ftdebug.o \
96 - 3rdparty/freetype/src/base/ftinit.o \ 18 - 3rdparty/freetype/src/base/ftinit.o \
97 - 3rdparty/freetype/src/base/ftbase.o \ 19 - 3rdparty/freetype/src/base/ftbase.o \
98 - 3rdparty/freetype/src/base/ftglyph.o \ 20 - 3rdparty/freetype/src/base/ftglyph.o \
99 - 3rdparty/freetype/src/base/ftmm.o \ 21 - 3rdparty/freetype/src/base/ftmm.o \
100 - 3rdparty/freetype/src/base/ftbbox.o \ 22 - 3rdparty/freetype/src/base/ftbbox.o \
101 - 3rdparty/freetype/src/autohint/autohint.o \ 23 - 3rdparty/freetype/src/autohint/autohint.o \
102 - 3rdparty/freetype/src/cache/ftcache.o \ 24 - 3rdparty/freetype/src/cache/ftcache.o \
103 - 3rdparty/freetype/src/cff/cff.o \ 25 - 3rdparty/freetype/src/cff/cff.o \
104 - 3rdparty/freetype/src/cid/type1cid.o \ 26 - 3rdparty/freetype/src/cid/type1cid.o \
105 - 3rdparty/freetype/src/psaux/psaux.o \ 27 - 3rdparty/freetype/src/psaux/psaux.o \
106 - 3rdparty/freetype/src/psnames/psmodule.o \ 28 - 3rdparty/freetype/src/psnames/psmodule.o \
107 - 3rdparty/freetype/src/raster/raster.o \ 29 - 3rdparty/freetype/src/raster/raster.o \
108 - 3rdparty/freetype/src/sfnt/sfnt.o \ 30 - 3rdparty/freetype/src/sfnt/sfnt.o \
109 - 3rdparty/freetype/src/smooth/smooth.o \ 31 - 3rdparty/freetype/src/smooth/smooth.o \
110 - 3rdparty/freetype/src/truetype/truetype.o \ 32 - 3rdparty/freetype/src/truetype/truetype.o \
111 - 3rdparty/freetype/src/type1/type1.o \ 33 - 3rdparty/freetype/src/type1/type1.o \
112 - 3rdparty/freetype/src/winfonts/winfnt.o \ 34 - 3rdparty/freetype/src/winfonts/winfnt.o \
113 - allmoc.o $(QT_MODULE_OBJ) 35 - allmoc.o $(QT_MODULE_OBJ)
114 +SOURCES =allmoc.cpp
115 +OBJECTS =allmoc.o $(QT_MODULE_OBJ) 36 +OBJECTS =allmoc.o $(QT_MODULE_OBJ)
116 INTERFACES = 37 INTERFACES =
117 UICDECLS = 38 UICDECLS =
118 UICIMPLS = 39 UICIMPLS =