Changeset 05f0d56b481c6366f843839f26b44dbf364dd3b8

Show
Ignore:
Timestamp:
24/07/07 19:32:33 (1 year ago)
Author:
Damien Fouilleul <damienf@videolan.org>
git-committer:
Damien Fouilleul <damienf@videolan.org> 1185298353 +0000
git-parent:

[8aa887870319cc0089f781b6ecd332ae7af5c02c]

git-author:
Damien Fouilleul <damienf@videolan.org> 1185298353 +0000
Message:

Makefile.am: much simpler rules for win32, now that libtoo linking is working

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • src/Makefile.am

    r62e2d1b r05f0d56  
    1212BUILT_SOURCES = modules/builtin.h misc/revision.c 
    1313CLEANFILES = $(BUILT_SOURCES) 
    14 MOSTLYCLEANFILES = $(dist_dllimport_DATA) $(noinst_DATA) 
     14MOSTLYCLEANFILES =  
    1515 
    1616TOOLBOX = srcdir=$(top_srcdir) builddir=$(top_builddir) $(top_srcdir)/toolbox 
    …… 
    103103lib_LTLIBRARIES = libvlc.la libvlc-control.la 
    104104 
    105 AM_LDFLAGS = 
     105AM_LDFLAGS = -no-undefined 
    106106if HAVE_WIN32 
    107 AM_LDFLAGS += -static 
     107AM_LDFLAGS += -avoid-version 
    108108endif 
    109109 
    …… 
    114114libvlc_la_CXXFLAGS = `$(VLC_CONFIG) --cxxflags libvlc` 
    115115libvlc_la_OBJCFLAGS = `$(VLC_CONFIG) --objcflags libvlc` 
    116 libvlc_la_LDFLAGS = `$(VLC_CONFIG) --libs libvlc` $(AM_LDFLAGS) \ 
    117     -no-undefined -export-symbols $(srcdir)/libvlc.sym -version-info 1:0:0 
     116libvlc_la_LDFLAGS = `$(VLC_CONFIG) --libs libvlc` \ 
     117    -export-symbols $(srcdir)/libvlc.sym -version-info 1:0:0 
    118118libvlc_la_DEPENDENCIES = libvlc.sym 
    119119 
    …… 
    121121libvlc_control_la_LIBADD = libvlc.la 
    122122libvlc_control_la_CFLAGS = `$(VLC_CONFIG) --cflags libvlc` 
    123 libvlc_control_la_LDFLAGS = $(AM_LDFLAGS) \ 
    124     -no-undefined -export-symbols-regex '^_?(libvlc|mediacontrol)_.*' \ 
     123libvlc_control_la_LDFLAGS = -export-symbols-regex '^_?(libvlc|mediacontrol)_.*' \ 
    125124    -version-info 0:0:0 
    126125 
    …… 
    150149libvlc_la_SOURCES += $(SOURCES_libvlc_getopt) 
    151150endif 
    152  
    153 if HAVE_WIN32 
    154 dllimportdir = $(libdir) 
    155 dist_dllimport_DATA = libvlc.dll libvlc.dll.a 
    156 noinst_DATA = libvlc.def 
    157 endif 
    158  
    159 OBJECTS_libvlc_dll = $(libvlc_la_OBJECTS) $(libvlc_control_la_OBJECTS) 
    160  
    161 libvlc.dll.a libvlc.def: libvlc.dll 
    162     @objs=""; \ 
    163     for s in $(OBJECTS_libvlc_dll); do \ 
    164        objs="$$objs $$(dirname "$$s")/.libs/$$(basename $${s%.lo}).o" ; \ 
    165     done ; \ 
    166     echo $(DLLTOOL) --output-def libvlc.def --output-lib libvlc.dll.a -D $< $$objs ; \ 
    167     $(DLLTOOL) --output-def libvlc.def --output-lib libvlc.dll.a -D $< $$objs 
    168  
    169 libvlc.dll: $(OBJECTS_libvlc_dll) 
    170  
    171 .la.dll: 
    172     @ldfl="`$(VLC_CONFIG) --libs plugin libvlc pic` $(INCLUDED_LIBINTL)" ; \ 
    173     objs="$^"; \ 
    174     case `$(VLC_CONFIG) --linkage libvlc` in \ 
    175       c++)  ld="$(CXXLINK)" ;; \ 
    176       c|*)  ld="$(LINK)" ;; \ 
    177     esac ; \ 
    178     echo $$ld $$objs $$ldfl; \ 
    179     $$ld $$objs $$ldfl 
    180151 
    181152SOURCES_libvlc_beos = \