fixed addition of X11 -L and -l options on link lines.
This commit is contained in:
parent
c4f1dbdae4
commit
29c90a3b6c
|
@ -15,9 +15,12 @@ synergy_LDADD = \
|
||||||
$(DEPTH)/io/libio.a \
|
$(DEPTH)/io/libio.a \
|
||||||
$(DEPTH)/mt/libmt.a \
|
$(DEPTH)/mt/libmt.a \
|
||||||
$(DEPTH)/base/libbase.a \
|
$(DEPTH)/base/libbase.a \
|
||||||
-lX11 \
|
$(X_LIBS) \
|
||||||
-lXext \
|
$(X_PRE_LIBS) \
|
||||||
-lXtst \
|
-lXtst \
|
||||||
|
-lXext \
|
||||||
|
-lX11 \
|
||||||
|
$(X_EXTRA_LIBS) \
|
||||||
$(NULL)
|
$(NULL)
|
||||||
INCLUDES = \
|
INCLUDES = \
|
||||||
-I$(DEPTH)/base \
|
-I$(DEPTH)/base \
|
||||||
|
|
|
@ -54,7 +54,6 @@ dnl checks for system services
|
||||||
|
|
||||||
|
|
||||||
dnl adjust variables for X11 and pthreads
|
dnl adjust variables for X11 and pthreads
|
||||||
LIBS="$X_PRE_LIBS $LIBS $X_EXTRA_LIBS $X_LIBS $PTHREAD_LIBS"
|
|
||||||
CFLAGS="$CFLAGS $X_CFLAGS $PTHREAD_CFLAGS"
|
CFLAGS="$CFLAGS $X_CFLAGS $PTHREAD_CFLAGS"
|
||||||
CXXFLAGS="$CXXFLAGS $X_CFLAGS $PTHREAD_CFLAGS"
|
CXXFLAGS="$CXXFLAGS $X_CFLAGS $PTHREAD_CFLAGS"
|
||||||
CC="$PTHREAD_CC"
|
CC="$PTHREAD_CC"
|
||||||
|
|
|
@ -20,9 +20,10 @@ synergyd_LDADD = \
|
||||||
$(DEPTH)/io/libio.a \
|
$(DEPTH)/io/libio.a \
|
||||||
$(DEPTH)/mt/libmt.a \
|
$(DEPTH)/mt/libmt.a \
|
||||||
$(DEPTH)/base/libbase.a \
|
$(DEPTH)/base/libbase.a \
|
||||||
|
$(X_LIBS) \
|
||||||
|
$(X_PRE_LIBS) \
|
||||||
-lX11 \
|
-lX11 \
|
||||||
-lXext \
|
$(X_EXTRA_LIBS) \
|
||||||
-lXtst \
|
|
||||||
$(NULL)
|
$(NULL)
|
||||||
INCLUDES = \
|
INCLUDES = \
|
||||||
-I$(DEPTH)/base \
|
-I$(DEPTH)/base \
|
||||||
|
|
Loading…
Reference in New Issue