Changed src/Makefile.in, SANE_LDFLAGS is used now

DEVEL_2_0_BRANCH-1
Oliver Rauch 2000-11-14 17:51:57 +00:00
rodzic fb72ceeefa
commit bca9b3026a
1 zmienionych plików z 6 dodań i 8 usunięć

Wyświetl plik

@ -32,11 +32,9 @@ INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/include -I$(top_srcdir)/include \
@INCLUDES@ @GTK_CFLAGS@
DEFS = @DEFS@
CPPFLAGS = @CPPFLAGS@
CFLAGS = @CFLAGS@
LDFLAGS = @LDFLAGS@
LIBS = @LIBS@
SANE_LIBS = @SANE_LIBS@
SANE_CFLAGS = @SANE_CFLAGS@
CFLAGS = @CFLAGS@ @SANE_CFLAGS@
LDFLAGS = @LDFLAGS@ @SANE_LDFLAGS@
LIBS = @LIBS@ @SANE_LIBS@
GTK_LIBS = @GTK_LIBS@
GTK_CFLAGS = @GTK_CFLAGS@
GIMP_LIBS = @GIMP_LIBS@
@ -44,7 +42,7 @@ GIMP_LIBS = @GIMP_LIBS@
XSCAN = @XSCAN@
BINPROGS = @BINPROGS@
COMPILE = $(CC) -c $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) $(SANE_CFLAGS) $(GTK_CFLAGS)
COMPILE = $(CC) -c $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) $(GTK_CFLAGS)
LINK = $(CC) $(LDFLAGS) -o $@
@SET_MAKE@
@ -72,11 +70,11 @@ install: $(PROGRAMS)
xscanimage: $(XSCAN_OBJS) $(LIBSANEI) $(LIBLIB)
$(LINK) $(XSCAN_OBJS) $(LIBSANEI) \
$(LIBLIB) $(GIMP_LIBS) $(GTK_LIBS) $(LIBS) $(SANE_LIBS)
$(LIBLIB) $(GIMP_LIBS) $(GTK_LIBS) $(LIBS)
xcam: $(XCAM_OBJS) $(LIBSANEI) $(LIBLIB)
$(LINK) $(XCAM_OBJS) $(LIBSANEI) \
$(LIBLIB) $(GTK_LIBS) $(LIBS) $(SANE_LIBS)
$(LIBLIB) $(GTK_LIBS) $(LIBS)
clean:
rm -f *.o *~ .*~ *.bak