diff options
author | reinelt <reinelt@3ae390bd-cb1e-0410-b409-cd5a39f66f1f> | 2000-03-30 16:46:57 +0000 |
---|---|---|
committer | reinelt <reinelt@3ae390bd-cb1e-0410-b409-cd5a39f66f1f> | 2000-03-30 16:46:57 +0000 |
commit | 668e3626f8770f655164687ca59f1f23b60fb638 (patch) | |
tree | fbe96ccf9a9479df23bb99d460772ba9713b1119 /Makefile.in | |
parent | 277c1c4e412df449ea56ffac9f18a14c8b637fc9 (diff) | |
download | lcd4linux-668e3626f8770f655164687ca59f1f23b60fb638.tar.gz |
[lcd4linux @ 2000-03-30 16:46:57 by reinelt]
configure now handles '--with-x' and '--without-x' correct
git-svn-id: https://ssl.bulix.org/svn/lcd4linux/trunk@27 3ae390bd-cb1e-0410-b409-cd5a39f66f1f
Diffstat (limited to '')
-rw-r--r-- | Makefile.in | 22 |
1 files changed, 14 insertions, 8 deletions
diff --git a/Makefile.in b/Makefile.in index 03de66d..995d739 100644 --- a/Makefile.in +++ b/Makefile.in @@ -57,20 +57,23 @@ POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : +AWK = @AWK@ CC = @CC@ +LN_S = @LN_S@ MAKEINFO = @MAKEINFO@ PACKAGE = @PACKAGE@ VERSION = @VERSION@ AUTOMAKE_OPTIONS = foreign - CLEANFILES = *~ -AM_CFLAGS = -Wall -LDFLAGS = -L/usr/X11R6/lib -LDADD = -lX11 bin_PROGRAMS = lcd4linux -lcd4linux_SOURCES = lcd4linux.c cfg.c cfg.h parser.c parser.h processor.c processor.h system.c system.h isdn.c isdn.h filter.c filter.h display.c display.h pixmap.c pixmap.h fontmap.c fontmap.h Skeleton.c MatrixOrbital.c Raster.c XWindow.c + +AM_CFLAGS = $(X_CFLAGS) -Wall +lcd4linux_LDFLAGS = $(X_LIBS) +@WITH_X_TRUE@lcd4linux_LDADD = -lX11 + +lcd4linux_SOURCES = lcd4linux.c cfg.c cfg.h parser.c parser.h processor.c processor.h system.c system.h isdn.c isdn.h filter.c filter.h display.c display.h pixmap.c pixmap.h fontmap.c fontmap.h Skeleton.c MatrixOrbital.c Raster.c XWindow.c ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs @@ -80,13 +83,16 @@ PROGRAMS = $(bin_PROGRAMS) DEFS = @DEFS@ -I. -I$(srcdir) CPPFLAGS = @CPPFLAGS@ +LDFLAGS = @LDFLAGS@ LIBS = @LIBS@ +X_CFLAGS = @X_CFLAGS@ +X_LIBS = @X_LIBS@ +X_EXTRA_LIBS = @X_EXTRA_LIBS@ +X_PRE_LIBS = @X_PRE_LIBS@ lcd4linux_OBJECTS = lcd4linux.o cfg.o parser.o processor.o system.o \ isdn.o filter.o display.o pixmap.o fontmap.o Skeleton.o MatrixOrbital.o \ Raster.o XWindow.o -lcd4linux_LDADD = $(LDADD) -lcd4linux_DEPENDENCIES = -lcd4linux_LDFLAGS = +@WITH_X_TRUE@lcd4linux_DEPENDENCIES = CFLAGS = @CFLAGS@ COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) CCLD = $(CC) |