From 137eed8d9b1a39f2355770475147e59708bbb51e Mon Sep 17 00:00:00 2001 From: Alexandre Julliard <julliard@winehq.org> Date: Tue, 1 Oct 2002 18:16:19 +0000 Subject: [PATCH] Moved X flags and libraries out of Make.rules into the makefiles that need them. --- Make.rules.in | 5 +---- configure | 2 +- configure.ac | 2 +- dlls/d3d8/Makefile.in | 3 ++- dlls/ddraw/Makefile.in | 3 ++- dlls/glu32/Makefile.in | 3 ++- dlls/opengl32/Makefile.in | 3 ++- dlls/x11drv/Makefile.in | 5 +++-- 8 files changed, 14 insertions(+), 12 deletions(-) diff --git a/Make.rules.in b/Make.rules.in index 554b4fc38d8..ccbecb80d65 100644 --- a/Make.rules.in +++ b/Make.rules.in @@ -28,9 +28,6 @@ CC = @CC@ CPP = @CPP@ CFLAGS = @CFLAGS@ $(EXTRACFLAGS) OPTIONS = @OPTIONS@ -D_REENTRANT -X_CFLAGS = @X_CFLAGS@ -X_LIBS = @X_LIBS@ -XLIB = @X_PRE_LIBS@ @XLIB@ @X_EXTRA_LIBS@ LIBS = @LIBS@ YACC = @YACC@ LEX = @LEX@ @@ -51,7 +48,7 @@ LN = @LN@ LN_S = @LN_S@ TOOLSDIR = @TOOLSDIR@ DIVINCL = -I$(SRCDIR) -I. -I$(TOPSRCDIR)/include -I$(TOPOBJDIR)/include $(EXTRAINCL) -ALLCFLAGS = $(DIVINCL) $(CFLAGS) $(DEFS) $(OPTIONS) $(X_CFLAGS) +ALLCFLAGS = $(DIVINCL) $(CFLAGS) $(DEFS) $(OPTIONS) LD = @LD@ LDFLAGS = @LDFLAGS@ LDCOMBINE = $(LD) -r diff --git a/configure b/configure index a9fe8c5e362..845d5730e49 100755 --- a/configure +++ b/configure @@ -9589,7 +9589,7 @@ cat >>confdefs.h <<\_ACEOF #define HAVE_NAS 1 _ACEOF - NASLIBS="-laudio -lXt \$(X_LIBS) \$(XLIB)" + NASLIBS="-laudio -lXt $X_LIBS -lXext -lX11 $X_EXTRA_LIBS" fi fi diff --git a/configure.ac b/configure.ac index fff35d3ed80..ef92aeb31d2 100644 --- a/configure.ac +++ b/configure.ac @@ -602,7 +602,7 @@ AC_CHECK_HEADERS(audio/audiolib.h, [AC_CHECK_HEADERS(audio/soundlib.h,,,[#include <audio/audiolib.h>]) AC_CHECK_LIB(audio,AuCreateFlow, [AC_DEFINE(HAVE_NAS,1,[Define if you have NAS including devel headers]) - NASLIBS="-laudio -lXt \$(X_LIBS) \$(XLIB)"],, + NASLIBS="-laudio -lXt $X_LIBS -lXext -lX11 $X_EXTRA_LIBS"],, [-lXt $X_LIBS -lXext -lX11 $X_EXTRA_LIBS])]) dnl **** Check for libaudioio (which can be used to get solaris audio support) **** diff --git a/dlls/d3d8/Makefile.in b/dlls/d3d8/Makefile.in index aadd444d05a..bac604e61a6 100644 --- a/dlls/d3d8/Makefile.in +++ b/dlls/d3d8/Makefile.in @@ -4,7 +4,8 @@ SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = d3d8.dll IMPORTS = user32 gdi32 kernel32 -EXTRALIBS = $(LIBUUID) $(X_LIBS) $(XLIB) +EXTRAINCL = @X_CFLAGS@ +EXTRALIBS = $(LIBUUID) @X_LIBS@ @X_PRE_LIBS@ @XLIB@ @X_EXTRA_LIBS@ LDDLLFLAGS = @LDDLLFLAGS@ SYMBOLFILE = $(MODULE).tmp.o diff --git a/dlls/ddraw/Makefile.in b/dlls/ddraw/Makefile.in index 9e022d46efb..508b8f04b18 100644 --- a/dlls/ddraw/Makefile.in +++ b/dlls/ddraw/Makefile.in @@ -4,7 +4,8 @@ SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = ddraw.dll IMPORTS = user32 gdi32 kernel32 -EXTRALIBS = $(LIBUUID) $(X_LIBS) $(XLIB) +EXTRAINCL = @X_CFLAGS@ +EXTRALIBS = $(LIBUUID) @X_LIBS@ @X_PRE_LIBS@ @XLIB@ @X_EXTRA_LIBS@ LDDLLFLAGS = @LDDLLFLAGS@ SYMBOLFILE = $(MODULE).tmp.o diff --git a/dlls/glu32/Makefile.in b/dlls/glu32/Makefile.in index 9265d618689..e7ac2ff9c61 100644 --- a/dlls/glu32/Makefile.in +++ b/dlls/glu32/Makefile.in @@ -3,7 +3,8 @@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = glu32.dll -EXTRALIBS = $(X_LIBS) $(XLIB) +EXTRAINCL = @X_CFLAGS@ +EXTRALIBS = @X_LIBS@ @X_PRE_LIBS@ @XLIB@ @X_EXTRA_LIBS@ LDDLLFLAGS = @LDDLLFLAGS@ SYMBOLFILE = $(MODULE).tmp.o diff --git a/dlls/opengl32/Makefile.in b/dlls/opengl32/Makefile.in index 9cc0b4a9af9..84537dd1a26 100644 --- a/dlls/opengl32/Makefile.in +++ b/dlls/opengl32/Makefile.in @@ -4,7 +4,8 @@ SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = opengl32.dll IMPORTS = user32 gdi32 kernel32 -EXTRALIBS = $(X_LIBS) $(XLIB) +EXTRAINCL = @X_CFLAGS@ +EXTRALIBS = @X_LIBS@ @X_PRE_LIBS@ @XLIB@ @X_EXTRA_LIBS@ LDDLLFLAGS = @LDDLLFLAGS@ SYMBOLFILE = $(MODULE).tmp.o diff --git a/dlls/x11drv/Makefile.in b/dlls/x11drv/Makefile.in index 718735659ec..44c68afbd97 100644 --- a/dlls/x11drv/Makefile.in +++ b/dlls/x11drv/Makefile.in @@ -5,7 +5,8 @@ SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = x11drv.dll IMPORTS = user32 gdi32 advapi32 kernel32 ntdll -EXTRALIBS = $(X_LIBS) $(XLIB) +EXTRAINCL = @X_CFLAGS@ +EXTRALIBS = @X_LIBS@ @X_PRE_LIBS@ @XLIB@ @X_EXTRA_LIBS@ LDDLLFLAGS = @LDDLLFLAGS@ SYMBOLFILE = $(MODULE).tmp.o @@ -49,7 +50,7 @@ EXTRASUBDIRS = \ all: $(PROGRAMS) wineclipsrv: wineclipsrv.c - $(CC) $(ALLCFLAGS) -o wineclipsrv $(SRCDIR)/wineclipsrv.c $(X_LIBS) $(XLIB) $(LIBS) + $(CC) $(ALLCFLAGS) -o wineclipsrv $(SRCDIR)/wineclipsrv.c $(EXTRALIBS) $(LIBS) install:: $(PROGRAMS) $(MKINSTALLDIRS) $(bindir) -- GitLab