qf/quakeforge
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/quakeforge synced 2025-01-31 13:10:34 +00:00
Code Issues Projects Releases Packages Wiki Activity

X targets don't need X_PRE_LIBS

Browse source
This commit is contained in:
Jeff Teunissen 2010-12-24 01:42:25 -05:00
parent 02068f7092
commit 493466a8ec
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
nq/source/Makefile.am
View file

@ -165,7 +165,7 @@ nq_x11_libs= \
$(client_LIBS) $(client_LIBS)
nq_x11_SOURCES= sys_unix.c nq_x11_SOURCES= sys_unix.c
nq_x11_LDADD= $(nq_x11_libs) \ nq_x11_LDADD= $(nq_x11_libs) \
$(X_PRE_LIBS) $(VIDMODE_LIBS) $(DGA_LIBS) $(X_LIBS) -lX11 \ $(VIDMODE_LIBS) $(DGA_LIBS) $(X_LIBS) -lX11 \
$(X_EXTRA_LIBS) $(X_SHM_LIB) $(NET_LIBS) $(X_EXTRA_LIBS) $(X_SHM_LIB) $(NET_LIBS)
nq_x11_LDFLAGS= $(common_ldflags) nq_x11_LDFLAGS= $(common_ldflags)
nq_x11_DEPENDENCIES= $(nq_x11_libs) nq_x11_DEPENDENCIES= $(nq_x11_libs)
@ -197,7 +197,7 @@ nq_glx_libs= \
$(client_LIBS) $(client_LIBS)
nq_glx_SOURCES= sys_unix.c nq_glx_SOURCES= sys_unix.c
nq_glx_LDADD= $(nq_glx_libs) \ nq_glx_LDADD= $(nq_glx_libs) \
$(X_PRE_LIBS) $(VIDMODE_LIBS) $(DGA_LIBS) $(X_LIBS) -lX11 \ $(VIDMODE_LIBS) $(DGA_LIBS) $(X_LIBS) -lX11 \
-lXext $(X_EXTRA_LIBS) $(DL_LIBS) $(NET_LIBS) -lXext $(X_EXTRA_LIBS) $(DL_LIBS) $(NET_LIBS)
nq_glx_LDFLAGS= $(common_ldflags) nq_glx_LDFLAGS= $(common_ldflags)
nq_glx_DEPENDENCIES= $(nq_glx_libs) nq_glx_DEPENDENCIES= $(nq_glx_libs)

4
qw/source/Makefile.am
View file

@ -191,7 +191,7 @@ qw_client_x11_libs= \
$(client_LIBS) $(client_LIBS)
qw_client_x11_SOURCES= cl_sys_unix.c qw_client_x11_SOURCES= cl_sys_unix.c
qw_client_x11_LDADD= $(qw_client_x11_libs) \ qw_client_x11_LDADD= $(qw_client_x11_libs) \
$(X_PRE_LIBS) $(VIDMODE_LIBS) $(DGA_LIBS) $(X_LIBS) -lX11 \ $(VIDMODE_LIBS) $(DGA_LIBS) $(X_LIBS) -lX11 \
$(X_EXTRA_LIBS) $(X_SHM_LIB) $(NET_LIBS) $(LIBCURL) $(X_EXTRA_LIBS) $(X_SHM_LIB) $(NET_LIBS) $(LIBCURL)
qw_client_x11_LDFLAGS= $(common_ldflags) qw_client_x11_LDFLAGS= $(common_ldflags)
qw_client_x11_DEPENDENCIES= $(qw_client_x11_libs) qw_client_x11_DEPENDENCIES= $(qw_client_x11_libs)
@ -210,7 +210,7 @@ qw_client_glx_libs= \
$(client_LIBS) $(client_LIBS)
qw_client_glx_SOURCES= cl_sys_unix.c qw_client_glx_SOURCES= cl_sys_unix.c
qw_client_glx_LDADD= $(qw_client_glx_libs) \ qw_client_glx_LDADD= $(qw_client_glx_libs) \
$(X_PRE_LIBS) $(VIDMODE_LIBS) $(DGA_LIBS) $(X_LIBS) -lX11 \ $(VIDMODE_LIBS) $(DGA_LIBS) $(X_LIBS) -lX11 \
-lXext $(X_EXTRA_LIBS) $(DL_LIBS) $(NET_LIBS) $(LIBCURL) -lXext $(X_EXTRA_LIBS) $(DL_LIBS) $(NET_LIBS) $(LIBCURL)
qw_client_glx_LDFLAGS= $(common_ldflags) qw_client_glx_LDFLAGS= $(common_ldflags)
qw_client_glx_DEPENDENCIES= $(qw_client_glx_libs) qw_client_glx_DEPENDENCIES= $(qw_client_glx_libs)