Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
wine
Manage
Activity
Members
Labels
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Package registry
Container Registry
Model registry
Operate
Terraform modules
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Alexey Alyaev
wine
Commits
ddcd19cf
Commit
ddcd19cf
authored
11 years ago
by
Alexandre Julliard
Browse files
Options
Downloads
Patches
Plain Diff
makefiles: Don't make binaries depend on Makefile.in.
parent
210af2e3
No related branches found
Branches containing commit
Tags
wine-960728
Tags containing commit
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
Make.rules.in
+6
-6
6 additions, 6 deletions
Make.rules.in
configure
+11
-11
11 additions, 11 deletions
configure
configure.ac
+11
-11
11 additions, 11 deletions
configure.ac
with
28 additions
and
28 deletions
Make.rules.in
+
6
−
6
View file @
ddcd19cf
...
...
@@ -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)
...
...
This diff is collapsed.
Click to expand it.
configure
+
11
−
11
View file @
ddcd19cf
...
...
@@ -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)
...
...
This diff is collapsed.
Click to expand it.
configure.ac
+
11
−
11
View file @
ddcd19cf
...
...
@@ -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)
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment