Alexandre Julliard : makefiles: Don't make binaries depend on Makefile.in.
Module: wine Branch: master Commit: ddcd19cf63bea5300cee48127c765fab6341ff81 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ddcd19cf63bea5300cee48127c... Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Nov 25 14:41:39 2013 +0100 makefiles: Don't make binaries depend on Makefile.in. --- Make.rules.in | 12 ++++++------ configure | 22 +++++++++++----------- configure.ac | 22 +++++++++++----------- 3 files changed, 28 insertions(+), 28 deletions(-) diff --git a/Make.rules.in b/Make.rules.in index 7409e06..0617611 100644 --- a/Make.rules.in +++ b/Make.rules.in @@ -44,19 +44,19 @@ ALLCROSSCFLAGS = $(DEFS) -DWINE_CROSSTEST $(CPPFLAGS) $(CFLAGS) # Rules for main module -$(MODULE) $(MODULE:%=%.so) $(MODULE:%=%.fake): $(MAINSPEC) $(OBJS) Makefile.in +$(MODULE) $(MODULE:%=%.so) $(MODULE:%=%.fake): $(MAINSPEC) $(OBJS) $(WINEGCC) $(APPMODE) $(MODULEFLAGS) $(OBJS) -o $@ $(DELAYIMPORTS:%=-l%) $(IMPORTS:%=-l%) $(DELAYIMPORTS:%=-Wb,-d%) -lwine $(LIBPORT) $(EXTRALIBS) $(LDFLAGS) $(LIBS) # Rules for static libraries all: $(STATICLIB) -$(STATICLIB): $(OBJS) Makefile.in +$(STATICLIB): $(OBJS) $(RM) $@ $(AR) $(ARFLAGS) $@ $(OBJS) $(RANLIB) $@ -$(STATICLIB:.a=.cross.a): $(CROSSOBJS) Makefile.in +$(STATICLIB:.a=.cross.a): $(CROSSOBJS) $(RM) $@ $(CROSSAR) $(ARFLAGS) $@ $(CROSSOBJS) $(CROSSRANLIB) $@ @@ -87,13 +87,13 @@ depend: dummy # Rules for tests -$(TESTMODULE) $(TESTMODULE:%=%.so): $(OBJS) Makefile.in +$(TESTMODULE) $(TESTMODULE:%=%.so): $(OBJS) $(WINEGCC) $(APPMODE) $(OBJS) -o $@ $(IMPORTS:%=-l%) $(LDFLAGS) $(LIBS) -$(TESTMODULE_STRIPPED): $(OBJS) Makefile.in +$(TESTMODULE_STRIPPED): $(OBJS) $(WINEGCC) -s -Wb,-F,$(TESTMODULE) $(APPMODE) $(OBJS) -o $@ $(IMPORTS:%=-l%) $(LDFLAGS) $(LIBS) -$(CROSSTESTMODULE): $(CROSSOBJS) Makefile.in +$(CROSSTESTMODULE): $(CROSSOBJS) $(CROSSWINEGCC) $(CROSSOBJS) -o $@ $(IMPORTS:%=-l%) $(LDFLAGS) $(LIBS) $(WINETEST_RES): $(TESTMODULE_STRIPPED) diff --git a/configure b/configure index 680c049..84a04b4 100755 --- a/configure +++ b/configure @@ -7270,7 +7270,7 @@ all: libwine.dll libwine.a libwine.a: wine.def \$(DLLTOOL) -l \$@ -d \$(srcdir)/wine.def -libwine.dll: \$(OBJS) wine.def Makefile.in +libwine.dll: \$(OBJS) wine.def \$(CC) -shared \$(srcdir)/wine.def -o \$@ \$(OBJS) $crtlibs \$(EXTRALIBS) install install-lib:: libwine.dll \$(DESTDIR)\$(libdir) dummy @@ -7462,7 +7462,7 @@ fi LIBWINE_RULES=" all: libwine.dylib -libwine.\$(VERSION).dylib: \$(OBJS) Makefile.in +libwine.\$(VERSION).dylib: \$(OBJS) \$(CC) -dynamiclib -install_name @rpath/libwine.\$(SOVERSION).dylib -Wl,-rpath,@loader_path/ -compatibility_version \$(SOVERSION) -current_version \$(VERSION) \$(OBJS) \$(EXTRALIBS) \$(LDFLAGS) \$(LIBS) -o \$@ libwine.\$(SOVERSION).dylib: libwine.\$(VERSION).dylib @@ -7487,10 +7487,10 @@ clean:: as_fn_append LOADER_RULES " -$wine_binary: main.o Makefile.in wine_info.plist +$wine_binary: main.o wine_info.plist \$(CC) -o \$@ $LDEXECFLAGS main.o \$(LIBWINE) \$(LIBPORT) \$(EXTRALIBS) \$(LDFLAGS) \$(LDRPATH_LOCAL) -wine-installed: main.o Makefile.in wine_info.plist +wine-installed: main.o wine_info.plist \$(CC) -o \$@ $LDEXECFLAGS main.o \$(LIBWINE) \$(LIBPORT) \$(EXTRALIBS) \$(LDFLAGS) \$(LDRPATH_INSTALL) wine_info.plist: wine_info.plist.in \$(top_builddir)/include/config.h @@ -7645,7 +7645,7 @@ fi LIBWINE_RULES=" all: libwine.so -libwine.so: \$(OBJS) Makefile.in +libwine.so: \$(OBJS) \$(CC) -shared \$(OBJS) \$(EXTRALIBS) \$(LDFLAGS) \$(LIBS) -o \$@ install install-lib:: libwine.so \$(DESTDIR)\$(libdir) dummy @@ -7660,10 +7660,10 @@ clean:: as_fn_append LOADER_RULES " -$wine_binary: main.o Makefile.in +$wine_binary: main.o \$(CC) -o \$@ $LDEXECFLAGS main.o \$(LIBWINE) \$(LIBPORT) \$(EXTRALIBS) \$(LDFLAGS) \$(LDRPATH_LOCAL) -wine-installed: main.o Makefile.in +wine-installed: main.o \$(CC) -o \$@ $LDEXECFLAGS main.o \$(LIBWINE) \$(LIBPORT) \$(EXTRALIBS) \$(LDFLAGS) \$(LDRPATH_INSTALL) " ;; @@ -7996,7 +7996,7 @@ $as_echo "$ac_cv_c_dll_unixware" >&6; } LIBWINE_RULES=" all: libwine.so -libwine.so.\$(VERSION): \$(OBJS) wine.map Makefile.in +libwine.so.\$(VERSION): \$(OBJS) wine.map $LDSHARED \$(OBJS) \$(EXTRALIBS) \$(LDFLAGS) \$(LIBS) -o \$@ libwine.so.\$(SOVERSION): libwine.so.\$(VERSION) @@ -8021,10 +8021,10 @@ clean:: as_fn_append LOADER_RULES " -$wine_binary: main.o Makefile.in +$wine_binary: main.o \$(CC) -o \$@ $LDEXECFLAGS main.o \$(LIBWINE) \$(LIBPORT) \$(EXTRALIBS) \$(LDFLAGS) \$(LDRPATH_LOCAL) -wine-installed: main.o Makefile.in +wine-installed: main.o \$(CC) -o \$@ $LDEXECFLAGS main.o \$(LIBWINE) \$(LIBPORT) \$(EXTRALIBS) \$(LDFLAGS) \$(LDRPATH_INSTALL) " ;; @@ -14019,7 +14019,7 @@ case $host_os in as_fn_append LOADER_RULES " all: $wine_binary-preloader -$wine_binary-preloader: preloader.o Makefile.in +$wine_binary-preloader: preloader.o \$(CC) -o \$@ -static -nostartfiles -nodefaultlibs -Wl,-Ttext=0x7c400000 preloader.o \$(LIBPORT) \$(LDFLAGS) install install-lib:: $wine_binary-preloader \$(DESTDIR)\$(bindir) diff --git a/configure.ac b/configure.ac index faadbef..2c15f52 100644 --- a/configure.ac +++ b/configure.ac @@ -725,7 +725,7 @@ all: libwine.dll libwine.a libwine.a: wine.def \$(DLLTOOL) -l \$@ -d \$(srcdir)/wine.def -libwine.dll: \$(OBJS) wine.def Makefile.in +libwine.dll: \$(OBJS) wine.def \$(CC) -shared \$(srcdir)/wine.def -o \$@ \$(OBJS) $crtlibs \$(EXTRALIBS) install install-lib:: libwine.dll \$(DESTDIR)\$(libdir) dummy @@ -849,7 +849,7 @@ clean:: AC_SUBST(LIBWINE_RULES,[" all: libwine.dylib -libwine.\$(VERSION).dylib: \$(OBJS) Makefile.in +libwine.\$(VERSION).dylib: \$(OBJS) \$(CC) -dynamiclib -install_name @rpath/libwine.\$(SOVERSION).dylib -Wl,-rpath,@loader_path/ -compatibility_version \$(SOVERSION) -current_version \$(VERSION) \$(OBJS) \$(EXTRALIBS) \$(LDFLAGS) \$(LIBS) -o \$@ libwine.\$(SOVERSION).dylib: libwine.\$(VERSION).dylib @@ -873,10 +873,10 @@ clean:: "]) AS_VAR_APPEND([LOADER_RULES],[" -$wine_binary: main.o Makefile.in wine_info.plist +$wine_binary: main.o wine_info.plist \$(CC) -o \$@ $LDEXECFLAGS main.o \$(LIBWINE) \$(LIBPORT) \$(EXTRALIBS) \$(LDFLAGS) \$(LDRPATH_LOCAL) -wine-installed: main.o Makefile.in wine_info.plist +wine-installed: main.o wine_info.plist \$(CC) -o \$@ $LDEXECFLAGS main.o \$(LIBWINE) \$(LIBPORT) \$(EXTRALIBS) \$(LDFLAGS) \$(LDRPATH_INSTALL) wine_info.plist: wine_info.plist.in \$(top_builddir)/include/config.h @@ -911,7 +911,7 @@ wine_info.plist: wine_info.plist.in \$(top_builddir)/include/config.h AC_SUBST(LIBWINE_RULES,[" all: libwine.so -libwine.so: \$(OBJS) Makefile.in +libwine.so: \$(OBJS) \$(CC) -shared \$(OBJS) \$(EXTRALIBS) \$(LDFLAGS) \$(LIBS) -o \$@ install install-lib:: libwine.so \$(DESTDIR)\$(libdir) dummy @@ -925,10 +925,10 @@ clean:: "]) AS_VAR_APPEND([LOADER_RULES],[" -$wine_binary: main.o Makefile.in +$wine_binary: main.o \$(CC) -o \$@ $LDEXECFLAGS main.o \$(LIBWINE) \$(LIBPORT) \$(EXTRALIBS) \$(LDFLAGS) \$(LDRPATH_LOCAL) -wine-installed: main.o Makefile.in +wine-installed: main.o \$(CC) -o \$@ $LDEXECFLAGS main.o \$(LIBWINE) \$(LIBPORT) \$(EXTRALIBS) \$(LDFLAGS) \$(LDRPATH_INSTALL) "]) ;; @@ -993,7 +993,7 @@ wine-installed: main.o Makefile.in AC_SUBST(LIBWINE_RULES,[" all: libwine.so -libwine.so.\$(VERSION): \$(OBJS) wine.map Makefile.in +libwine.so.\$(VERSION): \$(OBJS) wine.map $LDSHARED \$(OBJS) \$(EXTRALIBS) \$(LDFLAGS) \$(LIBS) -o \$@ libwine.so.\$(SOVERSION): libwine.so.\$(VERSION) @@ -1017,10 +1017,10 @@ clean:: "]) AS_VAR_APPEND([LOADER_RULES],[" -$wine_binary: main.o Makefile.in +$wine_binary: main.o \$(CC) -o \$@ $LDEXECFLAGS main.o \$(LIBWINE) \$(LIBPORT) \$(EXTRALIBS) \$(LDFLAGS) \$(LDRPATH_LOCAL) -wine-installed: main.o Makefile.in +wine-installed: main.o \$(CC) -o \$@ $LDEXECFLAGS main.o \$(LIBWINE) \$(LIBPORT) \$(EXTRALIBS) \$(LDFLAGS) \$(LDRPATH_INSTALL) "]) ;; @@ -2013,7 +2013,7 @@ case $host_os in AS_VAR_APPEND([LOADER_RULES],[" all: $wine_binary-preloader -$wine_binary-preloader: preloader.o Makefile.in +$wine_binary-preloader: preloader.o \$(CC) -o \$@ -static -nostartfiles -nodefaultlibs -Wl,-Ttext=0x7c400000 preloader.o \$(LIBPORT) \$(LDFLAGS) install install-lib:: $wine_binary-preloader \$(DESTDIR)\$(bindir)
participants (1)
-
Alexandre Julliard