From 14c538c9c73b23b807e5327399db6bb991c808bb Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Fri, 24 Jan 2014 16:14:05 +0100 Subject: Win32Main: move to win32/ --- Makefile.am | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'Makefile.am') diff --git a/Makefile.am b/Makefile.am index 25352e362..6ef21ee23 100644 --- a/Makefile.am +++ b/Makefile.am @@ -151,7 +151,7 @@ src_mpd_SOURCES = \ src/IOThread.cxx src/IOThread.hxx \ src/Main.cxx src/Main.hxx \ src/Instance.cxx src/Instance.hxx \ - src/Win32Main.cxx \ + src/win32/Win32Main.cxx \ src/GlobalEvents.cxx src/GlobalEvents.hxx \ src/Daemon.cxx src/Daemon.hxx \ src/AudioCompress/compress.c \ @@ -211,14 +211,14 @@ src_mpd_SOURCES = \ # Windows resource file # -src/win/mpd_win32_rc.$(OBJEXT): src/win/mpd_win32_rc.rc +src/win32/mpd_win32_rc.$(OBJEXT): src/win32/mpd_win32_rc.rc $(WINDRES) -i $< -o $@ if HAVE_WINDOWS -noinst_DATA = src/win/mpd_win32_rc.rc +noinst_DATA = src/win32/mpd_win32_rc.rc -src_mpd_DEPENDENCIES = src/win/mpd_win32_rc.$(OBJEXT) -src_mpd_LDFLAGS = -Wl,src/win/mpd_win32_rc.$(OBJEXT) +src_mpd_DEPENDENCIES = src/win32/mpd_win32_rc.$(OBJEXT) +src_mpd_LDFLAGS = -Wl,src/win32/mpd_win32_rc.$(OBJEXT) endif if ENABLE_DESPOTIFY @@ -1633,4 +1633,4 @@ EXTRA_DIST = $(doc_DATA) autogen.sh \ test/test_archive_zzip.sh \ $(wildcard scripts/*.sh) \ $(man_MANS) $(DOCBOOK_FILES) doc/mpdconf.example doc/doxygen.conf \ - src/win/mpd_win32_rc.rc.in src/win/mpd.ico + src/win32/mpd_win32_rc.rc.in src/win32/mpd.ico -- cgit v1.2.3 From 250318329f9e662bd7ee5f07af14f175a0b12eeb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Revol?= Date: Fri, 1 Aug 2014 22:07:33 +0200 Subject: Makefile.am: fix dependencies for win32 It happened to me when doing the Haiku port, src/mpd failed to be relinked properly when editing source files, and likely also happens on win32, although I didn't try this change. When building for windows, src_mpd_DEPENDENCIES is overriden. Automake then disables the default version which contains all the static libraries. In Makefile.in: @HAVE_WINDOWS_FALSE@src_mpd_DEPENDENCIES = libmpd.a \ Instead we use EXTRA_src_mpd_DEPENDENCIES which is meant for this. --- Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Makefile.am') diff --git a/Makefile.am b/Makefile.am index 6ef21ee23..6a5e9fb27 100644 --- a/Makefile.am +++ b/Makefile.am @@ -217,7 +217,7 @@ src/win32/mpd_win32_rc.$(OBJEXT): src/win32/mpd_win32_rc.rc if HAVE_WINDOWS noinst_DATA = src/win32/mpd_win32_rc.rc -src_mpd_DEPENDENCIES = src/win32/mpd_win32_rc.$(OBJEXT) +EXTRA_src_mpd_DEPENDENCIES = src/win32/mpd_win32_rc.$(OBJEXT) src_mpd_LDFLAGS = -Wl,src/win32/mpd_win32_rc.$(OBJEXT) endif -- cgit v1.2.3