← Back to branch summary

~siretart/x2go/x2goagent-FAU-trunk

« back to all changes in this revision

Viewing changes to lib/freetype2/freetype/config/Makefile

  • Committer: Reinhard Tartler
  • Author(s): Oleksandr Shneyder
  • Date: 2011-01-26 14:03:31 UTC
  • Revision ID: git-v1:c8b1b34721bd3b355ef00f839bfecd87c2f5b11e
Imported Debian patch 3.4.0-3-1

Show diffs side-by-side

added added

removed removed

Lines of Context:
lib/freetype2/freetype/config/Makefile
21
21
 
22
22
# $XFree86: xc/config/cf/Imake.cf,v 3.88 2003/12/16 21:30:21 herrb Exp $
23
23
 
24
 
# Keep cpp from replacing path elements containing i486/i586/i686
25
 
 
26
24
# -----------------------------------------------------------------------
27
25
# site-specific configuration parameters that need to come before
28
26
# the platform-specific parameters - edit site.def to change
44
42
# platform:  $XFree86: xc/config/cf/linux.cf,v 3.220 2003/12/30 22:38:33 tsi Exp $
45
43
 
46
44
# operating system:  Linux 2.6.26-2-amd64 x86_64 [ELF] (2.6.26)
47
 
# libc: (6.7.0)
48
 
# binutils:     (218)
 
45
# libc: (6.9.0)
 
46
# binutils:     (219)
49
47
 
50
48
# $Xorg: lnxLib.rules,v 1.3 2000/08/17 19:41:47 cpqbld Exp $
51
49
# $XFree86: xc/config/cf/lnxLib.rules,v 3.52 2003/10/31 20:49:03 herrb Exp $
114
112
 
115
113
TKLIBNAME =
116
114
 
117
 
TKLIBDIR =
 
115
TKLIBDIR = /usr/lib64
118
116
 
119
117
TCLLIBNAME =
120
118
 
139
137
        DEPENDSRC = $(CONFIGSRC)/makedepend
140
138
 
141
139
          INCROOT = /usr/X11R6/include
142
 
        USRLIBDIR = /usr/X11R6/lib
 
140
        USRLIBDIR = /usr/X11R6/lib64
143
141
           VARDIR = /var
144
142
        VARLIBDIR = $(VARDIR)/lib
145
 
  SYSTEMUSRLIBDIR = /usr/lib
 
143
  SYSTEMUSRLIBDIR = /usr/lib64
146
144
  SYSTEMUSRINCDIR = /usr/include
147
 
         SHLIBDIR = /usr/X11R6/lib
 
145
         SHLIBDIR = /usr/X11R6/lib64
148
146
       LINTLIBDIR = $(USRLIBDIR)/lint
149
147
          MANPATH = /usr/X11R6/man
150
148
    MANSOURCEPATH = $(MANPATH)/man
165
163
# from  top Makefile
166
164
  BOOTSTRAPCFLAGS =
167
165
 
168
 
               CC = gcc -m32
169
 
               AS = gcc -m32 -c -x assembler
 
166
               CC = gcc
 
167
               AS = gcc -c -x assembler
170
168
 
171
169
.SUFFIXES: .cc
172
170
 
173
 
              CXX = c++ -m32
 
171
              CXX = c++
174
172
 
175
173
          CXXFILT = c++filt
176
174
 
177
175
           CXXLIB = -lstdc++
178
176
 
179
 
    CXXDEBUGFLAGS = -g -O3
 
177
    CXXDEBUGFLAGS = -g -O3 -fno-strict-aliasing
180
178
CXXDEPENDINCLUDES =
181
179
 CXXEXTRA_DEFINES =
182
180
CXXEXTRA_INCLUDES =
183
 
   CXXSTD_DEFINES = -Dlinux -D__i386__ -D_POSIX_C_SOURCE=199309L                                -D_POSIX_SOURCE -D_XOPEN_SOURCE                                 -D_BSD_SOURCE -D_SVID_SOURCE                                 -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64                                  -D_GNU_SOURCE                           $(CXXPROJECT_DEFINES)
 
181
   CXXSTD_DEFINES = -Dlinux -D__amd64__ -D_POSIX_C_SOURCE=199309L                               -D_POSIX_SOURCE -D_XOPEN_SOURCE                                 -D_BSD_SOURCE -D_SVID_SOURCE                                 -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64                                  -D_GNU_SOURCE                           $(CXXPROJECT_DEFINES)
184
182
       CXXOPTIONS =
185
183
      CXXINCLUDES = $(INCLUDES) $(TOP_INCLUDES) $(CXXEXTRA_INCLUDES)
186
184
       CXXDEFINES = $(CXXINCLUDES) $(CXXSTD_DEFINES) $(THREADS_CXXDEFINES) $(DEFINES) $(CXXEXTRA_DEFINES)
191
189
 
192
190
              CPP = cpp $(STD_CPP_DEFINES)
193
191
           RAWCPP = cpp -undef $(STD_CPP_OPTIONS)
194
 
    PREPROCESSCMD = gcc -m32 -E $(STD_CPP_DEFINES)
 
192
    PREPROCESSCMD = gcc -E $(STD_CPP_DEFINES)
195
193
 
196
194
          INSTALL = install
197
195
     INSTALLFLAGS = -c
198
196
 
199
 
               LD = gcc -m32 -nostdlib
 
197
               LD = gcc -nostdlib
200
198
 
201
199
              LEX = flex -l
202
200
               M4 = m4
245
243
              COL = col
246
244
         COLFLAGS = -b
247
245
 
248
 
            MODCC = gcc -m32
 
246
            MODCC = gcc
249
247
 
250
248
           MODCPP = cpp
251
249
        MODCFLAGS = $(CFLAGS)
252
 
            MODAS = gcc -m32 -c -x assembler
 
250
            MODAS = gcc -c -x assembler
253
251
       MODASFLAGS =
254
252
 
255
 
            MODLD = gcc -m32 -nostdlib
 
253
            MODLD = gcc -nostdlib
256
254
 
257
255
       MODLDFLAGS =
258
256
MODLDCOMBINEFLAGS = -r
262
260
 
263
261
     STD_INCLUDES =
264
262
  STD_CPP_OPTIONS = -traditional
265
 
  STD_CPP_DEFINES = -traditional -Dlinux -D__i386__ -D_POSIX_C_SOURCE=199309L                           -D_POSIX_SOURCE -D_XOPEN_SOURCE                                 -D_BSD_SOURCE -D_SVID_SOURCE                                 -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64                                  -D_GNU_SOURCE                           $(PROJECT_DEFINES)
266
 
      STD_DEFINES = -Dlinux -D__i386__ -D_POSIX_C_SOURCE=199309L                                -D_POSIX_SOURCE -D_XOPEN_SOURCE                                 -D_BSD_SOURCE -D_SVID_SOURCE                                 -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64                                  -D_GNU_SOURCE                           $(PROJECT_DEFINES)
 
263
  STD_CPP_DEFINES = -traditional -Dlinux -D__amd64__ -D_POSIX_C_SOURCE=199309L                          -D_POSIX_SOURCE -D_XOPEN_SOURCE                                 -D_BSD_SOURCE -D_SVID_SOURCE                                 -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64                                  -D_GNU_SOURCE                           $(PROJECT_DEFINES)
 
264
      STD_DEFINES = -Dlinux -D__amd64__ -D_POSIX_C_SOURCE=199309L                               -D_POSIX_SOURCE -D_XOPEN_SOURCE                                 -D_BSD_SOURCE -D_SVID_SOURCE                                 -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64                                  -D_GNU_SOURCE                           $(PROJECT_DEFINES)
267
265
 EXTRA_LOAD_FLAGS =  -Wl,-rpath-link,$(BUILDLIBDIR)
268
266
  EXTRA_LDOPTIONS =
269
267
  EXTRA_LIBRARIES =
297
295
 
298
296
      PROJECTROOT = /usr/X11R6
299
297
 
300
 
      CDEBUGFLAGS = -g -O3
 
298
      CDEBUGFLAGS = -g -O3 -fno-strict-aliasing
301
299
        CCOPTIONS = -ansi -Wall -Wpointer-arith -Wundef
302
300
 
303
301
      ALLINCLUDES = $(INCLUDES) $(EXTRA_INCLUDES) $(TOP_INCLUDES) $(INSTALLED_INCLUDES) $(STD_INCLUDES)
321
319
   DEPEND_DEFINES = -DUSE_MAKEDEPEND
322
320
 
323
321
# Not sure this belongs here
324
 
         TKLIBDIR =
 
322
         TKLIBDIR = /usr/lib64
325
323
         TKINCDIR =
326
324
        TKLIBNAME =
327
325
        TKLIBRARY = -L$(TKLIBDIR) -l$(TKLIBNAME)
936
934
LIBPNGINC=
937
935
 
938
936
LIBPNGDIR = /usr
939
 
LIBPNGLIBDIR = /usr/lib
 
937
LIBPNGLIBDIR = /usr/lib64
940
938
LIBPNGINCDIR = /usr/include
941
939
 
942
940
LIBPNGLIB = -lpng