aboutsummaryrefslogtreecommitdiffstats
path: root/x11-toolkits/qt30/files/patch-aa
blob: d30908925332eff7c2530947c348cb2a0a71e6d0 (plain) (blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
--- configs/freebsd-g++-shared  Wed Jun 13 03:56:43 2001
+++ configs/freebsd-g++-shared.new  Sun Dec  2 19:22:52 2001
@@ -6,7 +6,7 @@
 
 # Compiling with support libraries
 SYSCONF_CXXFLAGS_X11   = -I/usr/X11R6/include
-SYSCONF_CXXFLAGS_QT    = -I$(QTDIR)/include
+SYSCONF_CXXFLAGS_QT= -I$(QTDIR)/include $(SYSCONF_CXXFLAGS_THREAD)
 SYSCONF_CXXFLAGS_OPENGL    = -I/usr/X11R6/include
 
 # Compiling YACC output
@@ -23,7 +23,7 @@
 SYSCONF_LIBS_X11   = -lXext -lX11 -lm
 # Qt, Qt+OpenGL
 SYSCONF_LFLAGS_QT  = -L$(QTDIR)/lib
-SYSCONF_LIBS_QT        = -lqt$(QT_THREAD_SUFFIX)
+SYSCONF_LIBS_QT        = -lqt2$(QT_THREAD_SUFFIX) $(SYSCONF_LFLAGS_THREAD)
 SYSCONF_LIBS_QT_OPENGL = 
 # OpenGL
 SYSCONF_LFLAGS_OPENGL  = -L/usr/X11R6/lib
@@ -32,7 +32,7 @@
 SYSCONF_LIBS_YACC  = 
 
 # Linking applications
-SYSCONF_LINK       = g++
+SYSCONF_LINK       = objprelink $(OBJECTS) $(OBJMOC) && g++
 SYSCONF_LFLAGS     = 
 SYSCONF_LIBS       = 
 
@@ -46,7 +46,7 @@
 SYSCONF_LIBS_THREAD    = 
 
 # Meta-object compiler
-SYSCONF_MOC        = $(QTDIR)/bin/moc
+SYSCONF_MOC        = $(QTDIR)/bin/moc2
 
 # UI compiler
 SYSCONF_UIC        = $(QTDIR)/bin/uic
@@ -57,16 +57,15 @@
 #   - Usually needs to incorporate $(VER_MAJ), $(VER_MIN) and $(VER_PATCH)
 #
 SYSCONF_LINK_SHLIB = g++
-SYSCONF_LINK_TARGET_SHARED = lib$(TARGET).so.$(VER_MAJ).$(VER_MIN).$(VER_PATCH)
-SYSCONF_LINK_LIB_SHARED    =  $(SYSCONF_LINK_SHLIB) -shared -Wl,-soname,lib$(TARGET).so.$(VER_MAJ) \
+SYSCONF_LINK_TARGET_SHARED = lib$(TARGET).so.$(VER_MAJ)
+SYSCONF_LINK_LIB_SHARED    =  objprelink $(OBJECTS) $(OBJMOC) && \
+   $(SYSCONF_LINK_SHLIB) -shared -Wl,-soname,lib$(TARGET).so.$(VER_MAJ) \
                     $(LFLAGS) -o $(SYSCONF_LINK_TARGET_SHARED) \
                     $(OBJECTS) $(OBJMOC) $(LIBS) && \
                 mv $(SYSCONF_LINK_TARGET_SHARED) $(DESTDIR); \
                 cd $(DESTDIR) && \
-                rm -f lib$(TARGET).so lib$(TARGET).so.$(VER_MAJ) lib$(TARGET).so.$(VER_MAJ).$(VER_MIN); \
-                ln -s $(SYSCONF_LINK_TARGET_SHARED) lib$(TARGET).so; \
-                ln -s $(SYSCONF_LINK_TARGET_SHARED) lib$(TARGET).so.$(VER_MAJ); \
-                ln -s $(SYSCONF_LINK_TARGET_SHARED) lib$(TARGET).so.$(VER_MAJ).$(VER_MIN)
+                rm -f lib$(TARGET).so;\
+                ln -s $(SYSCONF_LINK_TARGET_SHARED) lib$(TARGET).so
 
 # Linking static libraries
 #   - Build the $(TARGET) library, eg. lib$(TARGET).a
@@ -77,8 +76,8 @@
 SYSCONF_LINK_LIB_STATIC    = rm -f $(DESTDIR)$(SYSCONF_LINK_TARGET_STATIC) ; \
                 $(SYSCONF_AR) $(DESTDIR)$(SYSCONF_LINK_TARGET_STATIC) $(OBJECTS) $(OBJMOC) 
 # Compiling application source
-SYSCONF_CXXFLAGS   = -pipe -fno-exceptions -O2
-SYSCONF_CFLAGS     = -pipe -fno-exceptions -O2
+SYSCONF_CXXFLAGS   = -DQT_PREFIX=\"${PREFIX}\" -pipe -fno-exceptions -O2
+SYSCONF_CFLAGS     = -DQT_PREFIX=\"${PREFIX}\" -pipe -fno-exceptions -O2
 # Default link type (static linking is still be used where required)
 SYSCONF_LINK_LIB   = $(SYSCONF_LINK_LIB_SHARED)
 SYSCONF_LINK_TARGET    = $(SYSCONF_LINK_TARGET_SHARED)