Generate Windows resource file on need basis

[vlc] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index c20f17a990d76163d2d04a644db633d506ab5240..fa26a9d5f21a3cc27933441924f64ea6ef8a0c32 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -16,7 +16,7 @@ EXTRA_DIST = extras/COPYING \
 BUILT_SOURCES = ../include/vlc_about.h
 CLEANFILES = $(BUILT_SOURCES)
 
-SUFFIXES = .pc.in .pc
+SUFFIXES = .pc.in .pc .rc.in .rc
 
 ###############################################################################
 # Headers
@@ -109,9 +109,9 @@ pluginsinclude_HEADERS = \
        $(NULL)
 
 noinst_HEADERS = \
-       ../include/mmx.h \
        ../include/vlc_codec_synchro.h \
        ../include/vlc_codecs.h \
+       ../include/vlc_extensions.h \
        ../include/vlc_fixups.h \
        ../include/vlc_interface.h \
        ../include/vlc_intf_strings.h \
@@ -157,6 +157,19 @@ CLEANFILES += $(pkgconfig_DATA)
        cd "$(top_builddir)" && \
        $(SHELL) ./config.status --file="src/$@"
 
+##############################################################################
+# Windows resource files
+##############################################################################
+
+if HAVE_WIN32
+noinst_DATA = libvlc_win32_rc.rc
+endif
+EXTRA_DIST += libvlc_win32_rc.rc.in
+
+.rc.in.rc: $(top_builddir)/config.status
+       cd "$(top_builddir)" && \
+       $(SHELL) ./config.status --file="src/$@"
+
 ###############################################################################
 # Building libvlc
 ###############################################################################
@@ -195,7 +208,7 @@ libvlccore_la_DEPENDENCIES += libvlc_win32_rc.$(OBJEXT)
 libvlccore_la_LDFLAGS += -Wl,libvlc_win32_rc.$(OBJEXT)
 endif
 
-libvlc_win32_rc.$(OBJEXT): $(top_builddir)/share/libvlc_win32_rc.rc
+libvlc_win32_rc.$(OBJEXT): libvlc_win32_rc.rc
        $(WINDRES) --include-dir $(top_srcdir)/share -i $< -o $@
 
 libvlc_la_SOURCES = $(SOURCES_libvlc_control)
@@ -279,10 +292,10 @@ SOURCES_libvlc_linux = \
        $(NULL)
 
 SOURCES_libvlc_win32 = \
-       config/dirs_win.c \
-       misc/w32thread.c \
-       misc/win32_specific.c \
-       network/winsock.c \
+       win32/dirs.c \
+       win32/specific.c \
+       win32/thread.c \
+       win32/winsock.c \
        $(NULL)
 
 SOURCES_libvlc_other = \
@@ -399,7 +412,6 @@ SOURCES_libvlc_common = \
        text/strings.c \
        text/unicode.c \
        text/filesystem.c \
-       text/wincp.c \
        text/iso_lang.c \
        text/iso-639_def.h \
        misc/md5.c \
@@ -416,6 +428,7 @@ SOURCES_libvlc_common = \
        modules/cache.c \
        modules/entry.c \
        modules/os.c \
+       modules/textdomain.c \
        misc/threads.c \
        misc/stats.c \
        misc/cpu.c \