Minor cleanup from the jpeg move. Reverted frontend link order.

ChangeLog

@@ -1,3 +1,9 @@
+2003-07-27  Henning Meier-Geinitz <henning@meier-geinitz.de>
+
+	* Makefile.in backend/Makefile.in doc/Makefile.in
+	  frontend/Makefile.in include/Makefile.in sanei/Makefile.in: Minor
+	  cleanup from the jpeg move. Reverted frontend link order.
+
 2003-07-26  Oliver Schwartz <Oliver.Schwartz@gmx.de>
 
 	* backend/snapscan-usb.c backend/snapscan-usb.h:

Makefile.in

@@ -39,7 +39,7 @@ DISTFILES = AUTHORS COPYING ChangeLog ChangeLog-1.0.0 ChangeLog-1.0.1 \
   ChangeLog-1.0.2 ChangeLog-1.0.3 ChangeLog-1.0.4 ChangeLog-1.0.5 \
   ChangeLog-1.0.6 ChangeLog-1.0.7 ChangeLog-1.0.8 ChangeLog-1.0.9 \
   ChangeLog-1.0.10 ChangeLog-1.0.12 LICENSE Makefile.in NEWS \
-  PROBLEMS PROJECTS README README.aix README.beos README.darwin \
+  PROBLEMS PROJECTS README README.aix README.beos README.darwin README.djpeg \
   README.freebsd \
   README.hp-ux README.linux README.netbsd \
   README.openbsd README.os2 README.solaris README.unixware2 README.unixware7 \

backend/Makefile.in

@@ -417,11 +417,11 @@ libsane-dll.la libsane.la: ../sanei/sanei_pa4s2.lo
 libsane-dll.la libsane.la: ../sanei/sanei_usb.lo
 libsane-dll.la libsane.la: ../sanei/sanei_pv8630.lo
 libsane-dll.la libsane.la: ../sanei/sanei_lm983x.lo
-endif
-
-ifneq ($(@SANEI_JPEG@),)
+ifneq (@SANEI_JPEG@,)
 libsane-dll.la libsane.la: ../sanei/sanei_jpeg.lo
 endif
+endif
+
 
 depend:
 	makedepend $(INCLUDES) *.c

doc/Makefile.in

@@ -56,6 +56,7 @@ SECT7   = sane.7
 MANPAGES = $(SECT1) $(SECT5) $(SECT7)
 READMES = README AUTHORS COPYING ChangeLog LICENSE NEWS PROBLEMS \
           PROJECTS README README.aix README.beos README.darwin README.freebsd \
+	  README.djpeg \
           README.hp-ux README.linux README.netbsd README.openbsd README.os2 \
           README.solaris README.unixware2 README.unixware7 TODO
 DOCS    = backend-writing.txt sane.ps sane.dvi

frontend/Makefile.in

@@ -93,17 +93,16 @@ test: test.o $(LIBSANE) $(LIBLIB)
 	@$(LIBTOOL) $(MLINK) $(LINK) test.o $(LIBLIB) $(LIBSANE) $(LIBS)
 
 saned: saned.o $(LIBSANEI) $(LIBSANE) $(LIBLIB)
-	@$(LIBTOOL) $(MLINK) $(LINK) saned.o \
-		$(LIBS) $(LIBSANE) $(LIBSANEI) $(LIBLIB)
+	@$(LIBTOOL) $(MLINK) $(LINK) saned.o $(LIBSANEI) $(LIBLIB) $(LIBSANE)  \
+		$(LIBS)
 
-scanimage: $(SCAN_OBJS) $(LIBSANEI) $(LIBSANE) $(LIBLIB) 
-	@$(LIBTOOL) $(MLINK) $(LINK) $(SCAN_OBJS) \
-		$(LIBS) $(LIBSANE) $(LIBSANEI) $(LIBLIB)
+scanimage: $(SCAN_OBJS) $(LIBSANE) $(LIBLIB)
+	@$(LIBTOOL) $(MLINK) $(LINK) $(SCAN_OBJS) $(LIBLIB) $(LIBSANE)  $(LIBS)
 
 # tstbackend is not compiled by default. 
 # To compile it, add tstbackend to BINPROGS.
-tstbackend: tstbackend.o $(LIBSANE) $(LIBLIB) $(LIBSANEI)
-	@$(LIBTOOL) $(MLINK) $(LINK) tstbackend.o $(LIBLIB) $(LIBSANE) $(LIBSANEI) $(LIBS)
+tstbackend: tstbackend.o $(LIBSANE) $(LIBLIB)
+	@$(LIBTOOL) $(MLINK) $(LINK) tstbackend.o $(LIBLIB) $(LIBSANE) $(LIBS)
 
 clean:
 	rm -f *.o tstbackend

include/Makefile.in

@@ -39,6 +39,7 @@ INSTALLED_INCLUDES = sane.h saneopts.h
 SANE_INCLUDES = $(addprefix $(top_srcdir)/include/sane/,$(INSTALLED_INCLUDES)) \
                 $(addprefix $(top_srcdir)/include/sane/,config.h.in sanei.h \
                 sanei_ab306.h sanei_auth.h sanei_backend.h \
+                sanei_cderror.h sanei_jinclude.h sanei_jpeg.h \
                 sanei_codec_ascii.h sanei_codec_bin.h sanei_config.h \
                 sanei_debug.h sanei_lm983x.h sanei_net.h sanei_pa4s2.h \
                 sanei_pio.h sanei_pv8630.h sanei_scsi.h sanei_thread.h \

sanei/Makefile.in

@@ -65,7 +65,7 @@ TESTPROGRAMS = test_wire
 DISTFILES = Makefile.in linux_sg3_err.h os2_srb.h sanei_DomainOS.c \
   sanei_DomainOS.h sanei_ab306.c sanei_auth.c sanei_codec_ascii.c \
   sanei_codec_bin.c sanei_config.c sanei_config2.c \
-  sanei_constrain_value.c sanei_init_debug.c  \
+  sanei_constrain_value.c sanei_init_debug.c sanei_jpeg.c \
   sanei_net.c sanei_pa4s2.c sanei_pio.c sanei_pv8630.c sanei_lm983x.c \
   sanei_scsi.c sanei_thread.c sanei_usb.c \
   sanei_wire.c test_wire.c