author | kergoth <kergoth> | 2002-06-07 18:53:14 (UTC) |
---|---|---|
committer | kergoth <kergoth> | 2002-06-07 18:53:14 (UTC) |
commit | 640d964cfdc7467f6cacb513087cd3acda2c04f0 (patch) (unidiff) | |
tree | 9a784686c1795f8b1f81eb344598f3b549d43467 /configs | |
parent | dfb9c76738bb68e235114c5ad43dbd26a59b98ab (diff) | |
download | opie-640d964cfdc7467f6cacb513087cd3acda2c04f0.zip opie-640d964cfdc7467f6cacb513087cd3acda2c04f0.tar.gz opie-640d964cfdc7467f6cacb513087cd3acda2c04f0.tar.bz2 |
Backing out unintentional merge from TT branch.
-rw-r--r-- | configs/linux-arm-g++-sharedx11 | 97 | ||||
-rw-r--r-- | configs/linux-generic-g++-sharedx11 | 94 |
2 files changed, 0 insertions, 191 deletions
diff --git a/configs/linux-arm-g++-sharedx11 b/configs/linux-arm-g++-sharedx11 deleted file mode 100644 index b810b05..0000000 --- a/configs/linux-arm-g++-sharedx11 +++ b/dev/null | |||
@@ -1,97 +0,0 @@ | |||
1 | # Compiling | ||
2 | INTERFACE_DECL_PATH = . | ||
3 | SYSCONF_CXX = arm-linux-g++ | ||
4 | SYSCONF_CC = arm-linux-gcc | ||
5 | DASHCROSS = -arm | ||
6 | |||
7 | # Set XROOT to the root directory of the arm X11 files for cross compiling | ||
8 | XROOT=/scratch/src/xfree86.41/xbinaries | ||
9 | # Compiling with support libraries | ||
10 | SYSCONF_CXXFLAGS_X11= | ||
11 | SYSCONF_CXXFLAGS_QT= -I$(QTDIR)/include | ||
12 | SYSCONF_CXXFLAGS_OPENGL= -I$(XROOT)/usr/X11R6/include | ||
13 | |||
14 | # Compiling YACC output | ||
15 | SYSCONF_CXXFLAGS_YACC = -Wno-unused -Wno-parentheses | ||
16 | |||
17 | # Linking with support libraries | ||
18 | SYSCONF_RPATH_X11= | ||
19 | SYSCONF_RPATH_QT= -Wl,-rpath,$(QTDIR)/lib,-rpath,$(XROOT)/usr/X11R6/lib | ||
20 | SYSCONF_RPATH_OPENGL= -Wl,-rpath,$(XROOT)/usr/X11R6/lib | ||
21 | |||
22 | # Linking with support libraries | ||
23 | # X11 | ||
24 | SYSCONF_LFLAGS_X11= | ||
25 | SYSCONF_LIBS_X11= | ||
26 | # Qt, Qt+OpenGL | ||
27 | SYSCONF_LFLAGS_QT= -L$(QTDIR)/lib | ||
28 | SYSCONF_LIBS_QT = -lqt$(QT_THREAD_SUFFIX) | ||
29 | SYSCONF_LIBS_QT_OPENGL= | ||
30 | # OpenGL | ||
31 | SYSCONF_LFLAGS_OPENGL= -L$(XROOT)/usr/X11R6/lib | ||
32 | SYSCONF_LIBS_OPENGL= | ||
33 | # Yacc | ||
34 | SYSCONF_LIBS_YACC= | ||
35 | |||
36 | # Linking applications | ||
37 | SYSCONF_LINK = arm-linux-gcc | ||
38 | SYSCONF_LFLAGS = | ||
39 | SYSCONF_LIBS = | ||
40 | |||
41 | # Link flags for shared objects | ||
42 | SYSCONF_LFLAGS_SHOBJ= -shared | ||
43 | |||
44 | # Flags for threading | ||
45 | SYSCONF_CFLAGS_THREAD= -D_REENTRANT | ||
46 | SYSCONF_CXXFLAGS_THREAD= -D_REENTRANT | ||
47 | SYSCONF_LFLAGS_THREAD= | ||
48 | SYSCONF_LIBS_THREAD= -lpthread | ||
49 | |||
50 | # Point to /usr/bin for moc and uic since we are cross compiling here | ||
51 | # Meta-object compiler | ||
52 | SYSCONF_MOC = /usr/bin/moc | ||
53 | |||
54 | # UI compiler | ||
55 | SYSCONF_UIC = /usr/bin/uic | ||
56 | |||
57 | # Linking shared libraries | ||
58 | # - Build the $(TARGET) library, eg. lib$(TARGET).so.2.2.2 | ||
59 | # - Place target in $(DESTDIR) - which has a trailing / | ||
60 | # - Usually needs to incorporate $(VER_MAJ), $(VER_MIN) and $(VER_PATCH) | ||
61 | # | ||
62 | SYSCONF_LINK_SHLIB= arm-linux-gcc | ||
63 | SYSCONF_LINK_TARGET_SHARED= lib$(TARGET).so.$(VER_MAJ).$(VER_MIN).$(VER_PATCH) | ||
64 | SYSCONF_LINK_LIB_SHARED= $(SYSCONF_LINK_SHLIB) -shared -Wl,-soname,lib$(TARGET).so.$(VER_MAJ) \ | ||
65 | $(LFLAGS) -o $(SYSCONF_LINK_TARGET_SHARED) \ | ||
66 | $(OBJECTS) $(OBJMOC) $(LIBS) && \ | ||
67 | mv $(SYSCONF_LINK_TARGET_SHARED) $(DESTDIR); \ | ||
68 | cd $(DESTDIR) && \ | ||
69 | rm -f lib$(TARGET).so lib$(TARGET).so.$(VER_MAJ) lib$(TARGET).so.$(VER_MAJ).$(VER_MIN); \ | ||
70 | ln -s $(SYSCONF_LINK_TARGET_SHARED) lib$(TARGET).so; \ | ||
71 | ln -s $(SYSCONF_LINK_TARGET_SHARED) lib$(TARGET).so.$(VER_MAJ); \ | ||
72 | ln -s $(SYSCONF_LINK_TARGET_SHARED) lib$(TARGET).so.$(VER_MAJ).$(VER_MIN) | ||
73 | |||
74 | # Linking static libraries | ||
75 | # - Build the $(TARGET) library, eg. lib$(TARGET).a | ||
76 | # - Place target in $(DESTDIR) - which has a trailing / | ||
77 | # | ||
78 | SYSCONF_AR = arm-linux-ar cqs | ||
79 | SYSCONF_LINK_TARGET_STATIC = lib$(TARGET).a | ||
80 | SYSCONF_LINK_LIB_STATIC= rm -f $(DESTDIR)$(SYSCONF_LINK_TARGET_STATIC) ; \ | ||
81 | $(SYSCONF_AR) $(DESTDIR)$(SYSCONF_LINK_TARGET_STATIC) $(OBJECTS) $(OBJMOC) | ||
82 | # Compiling application source | ||
83 | SYSCONF_CXXFLAGS= -pipe -DQT_NO_COP -fno-exceptions -fno-rtti -O2 -Wall -W | ||
84 | SYSCONF_CFLAGS = -pipe -O2 -Wall -W | ||
85 | # Default link type (static linking is still be used where required) | ||
86 | SYSCONF_LINK_LIB= $(SYSCONF_LINK_LIB_SHARED) | ||
87 | SYSCONF_LINK_TARGET= $(SYSCONF_LINK_TARGET_SHARED) | ||
88 | # Compiling library source | ||
89 | SYSCONF_CXXFLAGS_LIB= -fPIC | ||
90 | SYSCONF_CFLAGS_LIB= -fPIC | ||
91 | # Compiling shared-object source | ||
92 | SYSCONF_CXXFLAGS_SHOBJ= -fPIC | ||
93 | SYSCONF_CFLAGS_SHOBJ= -fPIC | ||
94 | # Linking Qt | ||
95 | SYSCONF_LIBS_QTLIB= $(SYSCONF_LFLAGS_X11) $(QT_LIBS_MT) $(QT_LIBS_OPT) | ||
96 | # Linking Qt applications | ||
97 | SYSCONF_LIBS_QTAPP= | ||
diff --git a/configs/linux-generic-g++-sharedx11 b/configs/linux-generic-g++-sharedx11 deleted file mode 100644 index 1cd7a46..0000000 --- a/configs/linux-generic-g++-sharedx11 +++ b/dev/null | |||
@@ -1,94 +0,0 @@ | |||
1 | # Compiling | ||
2 | INTERFACE_DECL_PATH = . | ||
3 | SYSCONF_CXX = g++ | ||
4 | SYSCONF_CC = gcc | ||
5 | DASHCROSS = | ||
6 | |||
7 | # Compiling with support libraries | ||
8 | SYSCONF_CXXFLAGS_X11= | ||
9 | SYSCONF_CXXFLAGS_QT= -I$(QTDIR)/include | ||
10 | SYSCONF_CXXFLAGS_OPENGL= -I/usr/X11R6/include | ||
11 | |||
12 | # Compiling YACC output | ||
13 | SYSCONF_CXXFLAGS_YACC = -Wno-unused -Wno-parentheses | ||
14 | |||
15 | # Linking with support libraries | ||
16 | SYSCONF_RPATH_X11= | ||
17 | SYSCONF_RPATH_QT= -Wl,-rpath,$(QTDIR)/lib | ||
18 | SYSCONF_RPATH_OPENGL= -Wl,-rpath,/usr/X11R6/lib | ||
19 | |||
20 | # Linking with support libraries | ||
21 | # X11 | ||
22 | SYSCONF_LFLAGS_X11= | ||
23 | SYSCONF_LIBS_X11= | ||
24 | # Qt, Qt+OpenGL | ||
25 | SYSCONF_LFLAGS_QT= -L$(QTDIR)/lib | ||
26 | SYSCONF_LIBS_QT = -lqt$(QT_THREAD_SUFFIX) | ||
27 | SYSCONF_LIBS_QT_OPENGL= | ||
28 | # OpenGL | ||
29 | SYSCONF_LFLAGS_OPENGL= -L/usr/X11R6/lib | ||
30 | SYSCONF_LIBS_OPENGL= | ||
31 | # Yacc | ||
32 | SYSCONF_LIBS_YACC= | ||
33 | |||
34 | # Linking applications | ||
35 | SYSCONF_LINK = gcc | ||
36 | SYSCONF_LFLAGS = | ||
37 | SYSCONF_LIBS = | ||
38 | |||
39 | # Link flags for shared objects | ||
40 | SYSCONF_LFLAGS_SHOBJ= -shared | ||
41 | |||
42 | # Flags for threading | ||
43 | SYSCONF_CFLAGS_THREAD= -D_REENTRANT | ||
44 | SYSCONF_CXXFLAGS_THREAD= -D_REENTRANT | ||
45 | SYSCONF_LFLAGS_THREAD= | ||
46 | SYSCONF_LIBS_THREAD= -lpthread | ||
47 | |||
48 | # Meta-object compiler | ||
49 | SYSCONF_MOC = $(QTDIR)/bin/moc | ||
50 | |||
51 | # UI compiler | ||
52 | SYSCONF_UIC = $(QTDIR)/bin/uic | ||
53 | |||
54 | # Linking shared libraries | ||
55 | # - Build the $(TARGET) library, eg. lib$(TARGET).so.2.2.2 | ||
56 | # - Place target in $(DESTDIR) - which has a trailing / | ||
57 | # - Usually needs to incorporate $(VER_MAJ), $(VER_MIN) and $(VER_PATCH) | ||
58 | # | ||
59 | SYSCONF_LINK_SHLIB= gcc | ||
60 | SYSCONF_LINK_TARGET_SHARED= lib$(TARGET).so.$(VER_MAJ).$(VER_MIN).$(VER_PATCH) | ||
61 | SYSCONF_LINK_LIB_SHARED= $(SYSCONF_LINK_SHLIB) -shared -Wl,-soname,lib$(TARGET).so.$(VER_MAJ) \ | ||
62 | $(LFLAGS) -o $(SYSCONF_LINK_TARGET_SHARED) \ | ||
63 | $(OBJECTS) $(OBJMOC) $(LIBS) && \ | ||
64 | mv $(SYSCONF_LINK_TARGET_SHARED) $(DESTDIR); \ | ||
65 | cd $(DESTDIR) && \ | ||
66 | rm -f lib$(TARGET).so lib$(TARGET).so.$(VER_MAJ) lib$(TARGET).so.$(VER_MAJ).$(VER_MIN); \ | ||
67 | ln -s $(SYSCONF_LINK_TARGET_SHARED) lib$(TARGET).so; \ | ||
68 | ln -s $(SYSCONF_LINK_TARGET_SHARED) lib$(TARGET).so.$(VER_MAJ); \ | ||
69 | ln -s $(SYSCONF_LINK_TARGET_SHARED) lib$(TARGET).so.$(VER_MAJ).$(VER_MIN) | ||
70 | |||
71 | # Linking static libraries | ||
72 | # - Build the $(TARGET) library, eg. lib$(TARGET).a | ||
73 | # - Place target in $(DESTDIR) - which has a trailing / | ||
74 | # | ||
75 | SYSCONF_AR = ar cqs | ||
76 | SYSCONF_LINK_TARGET_STATIC = lib$(TARGET).a | ||
77 | SYSCONF_LINK_LIB_STATIC= rm -f $(DESTDIR)$(SYSCONF_LINK_TARGET_STATIC) ; \ | ||
78 | $(SYSCONF_AR) $(DESTDIR)$(SYSCONF_LINK_TARGET_STATIC) $(OBJECTS) $(OBJMOC) | ||
79 | # Compiling application source | ||
80 | SYSCONF_CXXFLAGS= -pipe -DQT_NO_COP -fno-exceptions -fno-rtti -O2 -Wall -W | ||
81 | SYSCONF_CFLAGS = -pipe -O2 -Wall -W | ||
82 | # Default link type (static linking is still be used where required) | ||
83 | SYSCONF_LINK_LIB= $(SYSCONF_LINK_LIB_SHARED) | ||
84 | SYSCONF_LINK_TARGET= $(SYSCONF_LINK_TARGET_SHARED) | ||
85 | # Compiling library source | ||
86 | SYSCONF_CXXFLAGS_LIB= -fPIC | ||
87 | SYSCONF_CFLAGS_LIB= -fPIC | ||
88 | # Compiling shared-object source | ||
89 | SYSCONF_CXXFLAGS_SHOBJ= -fPIC | ||
90 | SYSCONF_CFLAGS_SHOBJ= -fPIC | ||
91 | # Linking Qt | ||
92 | SYSCONF_LIBS_QTLIB= $(SYSCONF_LFLAGS_X11) $(QT_LIBS_MT) $(QT_LIBS_OPT) | ||
93 | # Linking Qt applications | ||
94 | SYSCONF_LIBS_QTAPP= | ||