marko10_000
/
wine-wine
forked from Mirrors/wine-wine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Moved X flags and libraries out of Make.rules into the makefiles that 

need them.
oldstable
Alexandre Julliard 2002-10-01 18:16:19 +00:00
parent b989620b46
commit 137eed8d9b
8 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Make.rules.in
View File

@ -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

2
configure vendored
View File

@ -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

2
configure.ac
View File

@ -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) ****

3
dlls/d3d8/Makefile.in
View File

@ -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

3
dlls/ddraw/Makefile.in
View File

@ -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

3
dlls/glu32/Makefile.in
View File

@ -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

3
dlls/opengl32/Makefile.in
View File

@ -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

5
dlls/x11drv/Makefile.in
View File

@ -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)