[PATCH] Filter out -l parameters when setting dependencies

[Alan Coopersmith]

On 05/ 8/13 03:57 PM, Gustavo Noronha Silva wrote:
> Newer make (Fedora 19) gets confused when it finds a -l parameter in a
> dependency, and tries to make it as a target, causing the build to fail.
>
> Signed-off-by: Gustavo Noronha Silva <gustavo.noronha at collabora.com>
> ---

These files seem to be an unrelated change relating to pixman:

>   configure.ac                        |   2 +-
>   fb/fb.h                             |   3 +
>   fb/fbpict.c                         | 149 +++++++++++++++++++++++++++++++++++-
>   fb/fbscreen.c                       |   1 +

NAK on these, as they use GNU make extensions and will break on BSD & Solaris make:

> diff --git a/hw/dmx/Makefile.am b/hw/dmx/Makefile.am
> index fb727e6..62a6bbe 100644
> --- a/hw/dmx/Makefile.am
> +++ b/hw/dmx/Makefile.am
> @@ -82,7 +82,7 @@ XDMX_LIBS = \
>           config/libdmxconfig.a
>
>   Xdmx_LDFLAGS = $(LD_EXPORT_SYMBOLS_FLAG)
> -Xdmx_DEPENDENCIES= $(XDMX_LIBS)
> +Xdmx_DEPENDENCIES= $(filter-out -l%,$(XDMX_LIBS))
>   Xdmx_LDADD = $(XDMX_LIBS) $(XDMX_SYS_LIBS) $(XSERVER_SYS_LIBS)
>
>   relink:
> diff --git a/hw/vfb/Makefile.am b/hw/vfb/Makefile.am
> index 9f4992c..06830ae 100644
> --- a/hw/vfb/Makefile.am
> +++ b/hw/vfb/Makefile.am
> @@ -25,7 +25,7 @@ XVFB_LIBS = \
>   	$(XSERVER_LIBS)
>
>   Xvfb_LDADD = $(XVFB_LIBS) $(XVFB_SYS_LIBS) $(XSERVER_SYS_LIBS)
> -Xvfb_DEPENDENCIES = $(XVFB_LIBS)
> +Xvfb_DEPENDENCIES = $(filter-out -l%,$(XVFB_LIBS))
>   Xvfb_LDFLAGS = $(LD_EXPORT_SYMBOLS_FLAG)
>
>   relink:
> diff --git a/hw/xfree86/Makefile.am b/hw/xfree86/Makefile.am
> index c3899b5..82bac1d 100644
> --- a/hw/xfree86/Makefile.am
> +++ b/hw/xfree86/Makefile.am
> @@ -65,7 +65,7 @@ Xorg_LDADD = \
>               $(LOCAL_LIBS) \
>               $(XORG_SYS_LIBS) \
>               $(XSERVER_SYS_LIBS)
> -Xorg_DEPENDENCIES = $(LOCAL_LIBS)
> +Xorg_DEPENDENCIES = $(filter-out -l%,$(LOCAL_LIBS))
>
>   Xorg_LDFLAGS = $(LD_EXPORT_SYMBOLS_FLAG)
>
> diff --git a/hw/xnest/Makefile.am b/hw/xnest/Makefile.am
> index 3c099cd..180d62c 100644
> --- a/hw/xnest/Makefile.am
> +++ b/hw/xnest/Makefile.am
> @@ -55,7 +55,7 @@ XNEST_LIBS = \
>
>   Xnest_SOURCES = $(SRCS)
>
> -Xnest_DEPENDENCIES = $(XNEST_LIBS)
> +Xnest_DEPENDENCIES = $(filter-out -l%,$(XNEST_LIBS))
>   Xnest_LDADD = $(XNEST_LIBS) $(XNEST_SYS_LIBS) $(XSERVER_SYS_LIBS)
>   Xnest_LDFLAGS = $(LD_EXPORT_SYMBOLS_FLAG)
>
> diff --git a/hw/xquartz/mach-startup/Makefile.am b/hw/xquartz/mach-startup/Makefile.am
> index 77962b1..c8626cc 100644
> --- a/hw/xquartz/mach-startup/Makefile.am
> +++ b/hw/xquartz/mach-startup/Makefile.am
> @@ -23,17 +23,18 @@ nodist_X11_bin_SOURCES = \
>   	mach_startupServer.c \
>   	mach_startupUser.c
>
> -X11_bin_DEPENDENCIES = \
> +# $(XSERVER_SYS_LIBS) is placed here in order to set command line ordering
> +# to work around build issues on Tiger.
> +X11_bin_LDADD =\
>   	$(top_builddir)/hw/xquartz/libXquartz.la \
>   	$(top_builddir)/hw/xquartz/xpr/libXquartzXpr.la \
>   	$(top_builddir)/dix/dixfonts.lo \
>   	$(top_builddir)/miext/rootless/librootless.la \
>   	$(top_builddir)/hw/xquartz/pbproxy/libxpbproxy.la \
> -	$(XQUARTZ_LIBS) $(XSERVER_LIBS)
> +	$(XQUARTZ_LIBS) $(XSERVER_LIBS) \
> +	$(XSERVER_SYS_LIBS)
>
> -# $(XSERVER_SYS_LIBS) is placed here in order to set command line ordering
> -# to work around build issues on Tiger.
> -X11_bin_LDADD = $(X11_bin_DEPENDENCIES) $(XSERVER_SYS_LIBS)
> +X11_bin_DEPENDENCIES = $(subst $(XSERVER_SYS_LIBS),, $(filter-out -l%,$(X11_bin_LDADD)))
>
>   X11_bin_LDFLAGS =  \
>   	-lXplugin \
> diff --git a/hw/xwin/Makefile.am b/hw/xwin/Makefile.am
> index 93ce570..a33c3f1 100644
> --- a/hw/xwin/Makefile.am
> +++ b/hw/xwin/Makefile.am
> @@ -153,7 +153,7 @@ INCLUDES = -I$(top_srcdir)/miext/rootless
>
>   XWIN_SYS_LIBS += -ldxguid
>
> -XWin_DEPENDENCIES = $(MULTIWINDOWEXTWM_LIBS) $(XWIN_GLX_LIBS) $(XWIN_LIBS) $(MAIN_LIB) $(XSERVER_LIBS)
> +XWin_DEPENDENCIES = $(filter-out -l%,$(MULTIWINDOWEXTWM_LIBS) $(XWIN_GLX_LIBS) $(XWIN_LIBS) $(MAIN_LIB) $(XSERVER_LIBS))
>   XWin_LDADD = $(MULTIWINDOW_LIBS) $(MULTIWINDOWEXTWM_LIBS) $(XWIN_GLX_LIBS) $(XWIN_GLX_LINK_FLAGS) $(XWIN_LIBS) $(MAIN_LIB) $(XSERVER_LIBS) $(XSERVER_SYS_LIBS) $(XWIN_SYS_LIBS)
>   XWin_LDFLAGS = -mwindows -static
>
> diff --git a/test/Makefile.am b/test/Makefile.am
> index 34f53fc..3509306 100644
> --- a/test/Makefile.am
> +++ b/test/Makefile.am
> @@ -117,7 +117,7 @@ libxservertest_la_LIBADD += \
>   endif
>   endif
>
> -libxservertest_la_DEPENDENCIES = $(libxservertest_la_LIBADD)
> +libxservertest_la_DEPENDENCIES = $(filter-out -l%,$(libxservertest_la_LIBADD))
>   endif
>
>   EXTRA_DIST = ddxstubs.c
>


-- 
	-Alan Coopersmith-              alan.coopersmith at oracle.com
	 Oracle Solaris Engineering - http://blogs.oracle.com/alanc