Changeset 47eb22002c8777a8dab0f6e8cb89054cbfd73b45

Show
Ignore:
Timestamp:
09/11/06 12:51:16 (2 years ago)
Author:
Sam Hocevar <sam@videolan.org>
git-committer:
Sam Hocevar <sam@videolan.org> 1157971876 +0000
git-parent:

[0ca651f00fca42b6edbd89f9f36bb24e283800d8]

git-author:
Sam Hocevar <sam@videolan.org> 1157971876 +0000
Message:
  • No longer use the $(pic) variable, since all flags are properly set
    in the configure script.
Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • bootstrap

    r75b1aa1 r47eb220  
    394394    fi 
    395395    cat >> "${makf}" << EOF 
    396 lib${mod}_a_CFLAGS = \`\$(VLC_CONFIG) --cflags builtin \$(pic) ${mod}\` 
    397 lib${mod}_a_CXXFLAGS = \`\$(VLC_CONFIG) --cxxflags builtin \$(pic) ${mod}\` 
    398 lib${mod}_a_OBJCFLAGS = \`\$(VLC_CONFIG) --objcflags builtin \$(pic) ${mod}\` 
     396lib${mod}_a_CFLAGS = \`\$(VLC_CONFIG) --cflags builtin pic ${mod}\` 
     397lib${mod}_a_CXXFLAGS = \`\$(VLC_CONFIG) --cxxflags builtin pic ${mod}\` 
     398lib${mod}_a_OBJCFLAGS = \`\$(VLC_CONFIG) --objcflags builtin pic ${mod}\` 
    399399lib${mod}_builtin_la_CFLAGS = \`\$(VLC_CONFIG) --cflags builtin ${mod}\` 
    400400lib${mod}_builtin_la_CXXFLAGS = \`\$(VLC_CONFIG) --cxxflags builtin ${mod}\` 

  • mozilla/Makefile.am

    r0ca651f r47eb220  
    166166 
    167167libnpvlc_a_SOURCES = $(SOURCES_mozilla_common) $(SOURCES_support) 
    168 libnpvlc_a_CFLAGS = `$(VLC_CONFIG) --cflags mozilla $(pic)` \ 
     168libnpvlc_a_CFLAGS = `$(VLC_CONFIG) --cflags mozilla pic` \ 
    169169                 $(CPPFLAGS_mozilla_EXTRA) 
    170 libnpvlc_a_CXXFLAGS = `$(VLC_CONFIG) --cxxflags mozilla $(pic)` \ 
     170libnpvlc_a_CXXFLAGS = `$(VLC_CONFIG) --cxxflags mozilla pic` \ 
    171171                   $(CPPFLAGS_mozilla_EXTRA) 
    172 LDFLAGS_libnpvlc = $(LDFLAGS_npvlc) `$(VLC_CONFIG) --libs mozilla vlc builtin $(pic)` 
     172LDFLAGS_libnpvlc = $(LDFLAGS_npvlc) `$(VLC_CONFIG) --libs mozilla vlc builtin pic` 
    173173libnpvlc_a_DEPENDENCIES = $(DATA_npvlc_rc) 
    174174 
    …… 
    183183############################################################################### 
    184184stamp-pic: 
    185     @for dep in "" `$(VLC_CONFIG) --target builtin $(pic)`; do \ 
     185    @for dep in "" `$(VLC_CONFIG) --target builtin pic`; do \ 
    186186      if test "$${dep}" -nt "$(LIBRARIES_mozilla)"; then \ 
    187187        rm -f $@; \ 

  • src/Makefile.am

    r0ca651f r47eb220  
    150150 
    151151libvlc_a_SOURCES = $(SOURCES_libvlc) 
    152 libvlc_a_CFLAGS = `$(VLC_CONFIG) --cflags vlc $(pic)` 
    153 libvlc_a_CXXFLAGS = `$(VLC_CONFIG) --cxxflags vlc $(pic)` 
    154 libvlc_a_OBJCFLAGS = `$(VLC_CONFIG) --objcflags vlc $(pic)` 
     152libvlc_a_CFLAGS = `$(VLC_CONFIG) --cflags vlc pic` 
     153libvlc_a_CXXFLAGS = `$(VLC_CONFIG) --cxxflags vlc pic` 
     154libvlc_a_OBJCFLAGS = `$(VLC_CONFIG) --objcflags vlc pic` 
    155155 
    156156libvlc_la_SOURCES = $(SOURCES_libvlc) 
    …… 
    204204 
    205205libvlc$(LIBEXT): $(OBJECTS_libvlc_so) stamp-builtins 
    206     @ldfl="`$(VLC_CONFIG) --libs plugin vlc builtin $(pic)` $(INCLUDED_LIBINTL)" ; \ 
     206    @ldfl="`$(VLC_CONFIG) --libs plugin vlc builtin pic` $(INCLUDED_LIBINTL)" ; \ 
    207207    case `$(VLC_CONFIG) --linkage vlc builtin` in \ 
    208208      c++)  ld="$(CXXLINK)" ;; \