Updates to Makefiles to prepare for transition to automake.

Fix a few bugs with "all" and "uninstall" targets to work when
$(builddir) != $(srcdir).  Added $(DESTDIR) to uninstall target.
Made $(distdir) related to current directory to match automake.
merge-requests/1/head
Chris Bagwell 2009-01-16 23:39:48 +00:00
rodzic ba164358db
commit c90e23a6d2
11 zmienionych plików z 140 dodań i 69 usunięć

Wyświetl plik

@ -122,7 +122,8 @@ Sanei internal code:
Miscellaneous coding:
Julien Blache (*), Mattias Ellert (*), Petter Reinholdtsen (*)
Julien Blache (*), Mattias Ellert (*), Petter Reinholdtsen (*),
Chris Bagwell (*)
Translators:
@ -150,7 +151,7 @@ Andrew Kuchling <amk@magnet.com>
Bernd Schroeder <bernd@aquila.muc.de>
Bertrik Sikken <bertrik@zonnet.nl>
Brian J. Murrell <brian@interlinx.bc.ca>
Chris Bagwell <cbagwell@users.sourceforge.net>
Chris Bagwell <cbagwell-guest@users.alioth.debian.org>
Chris Pinkham <cpinkham@corp.infi.net>
Christian Bucher <cbucher@vernetzt.at>
David Etherton <etherton@netcom.com>

Wyświetl plik

@ -1,3 +1,12 @@
2009-01-16 Chris Bagwell <cbagwell-guest at users.alioth.debian.org>
* doc/Makefile.in, frontend/Makefile.in, include/Makefile.in,
japi/Makefile.in, lib/Makefile.in, po/Makefile.in,
sanei/Makefile.in, testsuite/Makefile.in, tools/Makefile.in:
Updates to Makefiles to prepare for transition to automake.
Fix a few bugs with "all" and "uninstall" targets to work when
$(builddir) != $(srcdir). Added $(DESTDIR) to uninstall target.
Made $(distdir) related to current directory to match automake.
2009-01-16 Pierre Willenbrock <pierre@pirsoft.dnsalias.org>
* backend/genesys.c, backend/genesys.h, backend/genesys_devices.c,
backend/genesys_gl646.c, backend/genesys_gl841.c,

Wyświetl plik

@ -8,7 +8,7 @@ top_builddir = ..
PACKAGE = @PACKAGE@
VERSION = @VERSION@
package_version = @PACKAGE_STRING@
distdir = $(top_srcdir)/$(PACKAGE)-$(VERSION)
distdir = $(top_srcdir)/$(PACKAGE)-$(VERSION)/doc
prefix = @prefix@
exec_prefix = @exec_prefix@
@ -117,7 +117,7 @@ DISTFILES = Makefile.in backend-writing.txt descriptions.txt \
sane-hp5590.man sane-hpljm1005.man sane-cardscan.man sane-hp3900.man \
sane-epjitsu.man sane-hs2p.man sane-canon_dr.man sane-xerox_mfp.man
.PHONY: all clean depend dist distclean html html-man install \
.PHONY: all clean depend dist distdir distclean html html-man install \
sane-html uninstall
all: $(STANDARD) $(MANPAGES) html-pages
@ -175,21 +175,21 @@ install: all
uninstall:
@for page in $(SECT1); do \
echo removing $${page} in $(mandir)/man1/$${page}...; \
rm -f $(mandir)/man1/$${page}; \
rm -f $(DESTDIR)$(mandir)/man1/$${page}; \
done
@for page in $(SECT5); do \
echo removing $${page} in $(mandir)/man5/$${page}...; \
rm -f $(mandir)/man5/$${page}; \
rm -f $(DESTDIR)$(mandir)/man5/$${page}; \
done
@for page in $(SECT7); do \
echo removing $${page} in $(mandir)/man7/$${page}...; \
rm -f $(mandir)/man7/$${page}; \
rm -f $(DESTDIR)$(mandir)/man7/$${page}; \
done
@for page in $(SECT8); do \
echo removing $${page} in $(mandir)/man8/$${page}...; \
rm -f $(mandir)/man8/$${page}; \
rm -f $(DESTDIR)$(mandir)/man8/$${page}; \
done
rm -rf $(docdir)
rm -rf $(DESTDIR)$(docdir)
sane.ind: sane.tex net.tex
@echo Generating index for sane.ps...
@ -274,17 +274,23 @@ distclean: clean
depend:
dist: $(DISTFILES)
dist: distdir
distdir: $(DISTFILES)
for subdir in $(SUBDIRS) ; do \
$(MKDIR) $(distdir)/doc/$${subdir} ; \
$(MKDIR) $(distdir)/$${subdir} ; \
for file in $${subdir}/* ; do \
ln $$file $(distdir)/doc/$${subdir} 2> /dev/null \
|| cp -p $$file $(distdir)/doc/$${subdir} \
ln $(srcdir)/$$file $(distdir)/$${subdir} 2> /dev/null \
|| cp -p $(srcdir)/$$file $(distdir)/$${subdir} \
|| echo "ignoring: $$file" ; \
done ; \
done
for file in $(DISTFILES); do \
ln $$file $(distdir)/doc 2> /dev/null \
|| cp -p $$file $(distdir)/doc ; \
ln $(srcdir)/$$file $(distdir) 2> /dev/null \
|| cp -p $(srcdir)/$$file $(distdir)/doc ; \
done
# Used by top level distcheck target
dvi:
check:
installcheck:
distuninstallcheck:

Wyświetl plik

@ -7,7 +7,7 @@ top_builddir = ..
PACKAGE = @PACKAGE@
VERSION = @VERSION@
distdir = $(top_srcdir)/$(PACKAGE)-$(VERSION)
distdir = $(top_srcdir)/$(PACKAGE)-$(VERSION)/frontend
prefix = @prefix@
exec_prefix = @exec_prefix@
@ -64,7 +64,7 @@ SCAN_OBJS = scanimage.o stiff.o
DISTFILES = Makefile.in saned.c scanimage.c stiff.c stiff.h test.c tstbackend.c
.PHONY: all clean depend dist distclean install uninstall
.PHONY: all clean depend dist distdir distclean install uninstall
.c.o:
$(COMPILE) $<
@ -84,10 +84,10 @@ install: $(PROGRAMS)
uninstall:
@for program in $(BINPROGS); do \
rm -f $(bindir)/$${program}; \
rm -f $(DESTDIR)$(bindir)/$${program}; \
done
@for program in $(SBINPROGS); do \
rm -f $(sbindir)/$${program}; \
rm -f $(DESTDIR)$(sbindir)/$${program}; \
done
test: test.o $(LIBSANE) $(LIBLIB)
@ -116,9 +116,15 @@ distclean: clean
depend:
makedepend $(INCLUDES) *.c 2>/dev/null
dist: $(DISTFILES)
dist: distdir
distdir: $(DISTFILES)
for file in $(DISTFILES); do \
ln $$file $(distdir)/frontend 2> /dev/null \
|| cp -p $$file $(distdir)/frontend ; \
ln $(srcdir)/$$file $(distdir) 2> /dev/null \
|| cp -p $(srcdir)/$$file $(distdir) ; \
done
# Used by top level distcheck target
dvi:
check:
installcheck:
distuninstallcheck:

Wyświetl plik

@ -8,7 +8,7 @@ top_builddir = .
PACKAGE = @PACKAGE@
VERSION = @VERSION@
distdir = $(top_srcdir)/$(PACKAGE)-$(VERSION)
distdir = $(top_srcdir)/$(PACKAGE)-$(VERSION)/include
prefix = @prefix@
exec_prefix = @exec_prefix@
@ -51,7 +51,7 @@ OTHER_INCLUDES = $(addprefix $(top_srcdir)/include/,Makefile.in getopt.h \
DISTFILES = $(SANE_INCLUDES) $(OTHER_INCLUDES)
.PHONY: all clean depend dist distclean install uninstall
.PHONY: all clean depend dist distdir distclean install uninstall
all:
@ -73,17 +73,24 @@ install:
done
uninstall:
rm -rf $(includedir)/sane
rm -rf $(DESTDIR)$(includedir)/sane
depend:
dist: $(DISTFILES)
$(MKDIR) $(distdir)/include/sane
dist: distdir
distdir: $(DISTFILES)
$(MKDIR) $(distdir)/sane
for file in $(OTHER_INCLUDES); do \
ln $$file $(distdir)/include 2> /dev/null \
|| cp -p $$file $(distdir)/include; \
ln $$file $(distdir) 2> /dev/null \
|| cp -p $$file $(distdir); \
done
for file in $(SANE_INCLUDES); do \
ln $$file $(distdir)/include/sane 2> /dev/null \
|| cp -p $$file $(distdir)/include/sane; \
ln $$file $(distdir)/sane 2> /dev/null \
|| cp -p $$file $(distdir)/sane; \
done
# Used by top level distcheck target
dvi:
check:
installcheck:
distuninstallcheck:

Wyświetl plik

@ -11,7 +11,7 @@ top_builddir = ..
PACKAGE = @PACKAGE@
VERSION = @VERSION@
distdir = $(top_srcdir)/$(PACKAGE)-$(VERSION)
distdir = $(top_srcdir)/$(PACKAGE)-$(VERSION)/japi
prefix = @prefix@
exec_prefix = @exec_prefix@
@ -75,7 +75,7 @@ DISTFILES = ImageCanvas.java ImageCanvasClient.java Jscanimage.java \
SaneOption.java SaneParameters.java SaneRange.java ScanIt.java \
Test.java
.PHONY: all clean dist distclean install uninstall
.PHONY: all clean dist distdir distclean install uninstall
.SUFFIXES: .c .o .h .la .lo .java .class
@ -119,9 +119,15 @@ install:
# fixme
uninstall:
dist: $(DISTFILES)
dist: distdir
distdir: $(DISTFILES)
for file in $(DISTFILES); do \
ln $$file $(distdir)/japi 2> /dev/null \
|| cp -p $$file $(distdir)/japi ; \
ln $(srcdir)/$$file $(distdir) 2> /dev/null \
|| cp -p $(srcdir)/$$file $(distdir) ; \
done
# Used by top level distcheck target
dvi:
check:
installcheck:
distuninstallcheck:

Wyświetl plik

@ -7,7 +7,7 @@ top_builddir = ..
PACKAGE = @PACKAGE@
VERSION = @VERSION@
distdir = $(top_srcdir)/$(PACKAGE)-$(VERSION)
distdir = $(top_srcdir)/$(PACKAGE)-$(VERSION)/lib
prefix = @prefix@
exec_prefix = @exec_prefix@
@ -58,7 +58,7 @@ DISTFILES = Makefile.in alloca.c getenv.c getopt.c getopt1.c \
inet_ntop.c inet_pton.c isfdtype.c md5.c sigprocmask.c snprintf.c strdup.c \
strndup.c strsep.c usleep.c vsyslog.c
.PHONY: all check clean depend dist distclean install uninstall
.PHONY: all check clean depend dist distdir distclean install uninstall
.SUFFIXES:
.SUFFIXES: .c .o .lo
@ -90,9 +90,15 @@ distclean: clean
rm -f $(DISTCLEAN_FILES)
rm -f Makefile
dist: $(DISTFILES)
dist: distdir
distdir: $(DISTFILES)
for file in $(DISTFILES); do \
ln $$file $(distdir)/lib 2> /dev/null \
|| cp -p $$file $(distdir)/lib ; \
ln $(srcdir)/$$file $(distdir) 2> /dev/null \
|| cp -p $(srcidr)/$$file $(distdir) ; \
done
# Used by top level distcheck target
dvi:
check:
installcheck:
distuninstallcheck:

Wyświetl plik

@ -50,7 +50,7 @@ VPATH = @srcdir@
PACKAGE = @PACKAGE@
VERSION = @VERSION@
distdir = $(top_srcdir)/$(PACKAGE)-$(VERSION)
distdir = $(top_srcdir)/$(PACKAGE)-$(VERSION)/po
INSTALL_TRANSLATIONS = @INSTALL_TRANSLATIONS@
ifeq ($(INSTALL_TRANSLATIONS),install-translations)
@ -71,7 +71,7 @@ TMP_FILE_DIR = .tmp
DISTCLEAN_FILES = @DISTCLEAN_FILES@
.PHONY: all clean depend dist distclean install install-translations \
.PHONY: all clean depend dist distdir distclean install install-translations \
uninstall uninstall-translations all-mos update
all: $(ALL)
@ -120,7 +120,7 @@ uninstall-translations:
@for lang in $(ALL_LINGUAS) ; do \
dir=$(gnulocaledir)/$${lang}/LC_MESSAGES ; \
echo removing $${dir}/sane-*.mo ; \
rm -f $${dir}/sane-*.mo ; \
rm -f $(DESTDIR)$${dir}/sane-*.mo ; \
done
uninstall: $(UNINSTALL_TRANSLATIONS)
@ -137,8 +137,15 @@ distclean: clean
depend:
dist: $(DISTFILES)
dist: distdir
distdir: $(DISTFILES)
for file in $(DISTFILES); do \
ln $$file $(distdir)/po 2> /dev/null \
|| cp -p $$file $(distdir)/po ; \
ln $(srcidr)/$$file $(distdir) 2> /dev/null \
|| cp -p $(srcdir)/$$file $(distdir) ; \
done
# Used by top level distcheck target
dvi:
check:
installcheck:
distuninstallcheck:

Wyświetl plik

@ -7,7 +7,7 @@ top_builddir = ..
PACKAGE = @PACKAGE@
VERSION = @VERSION@
distdir = $(top_srcdir)/$(PACKAGE)-$(VERSION)
distdir = $(top_srcdir)/$(PACKAGE)-$(VERSION)/sanei
prefix = @prefix@
exec_prefix = @exec_prefix@
@ -73,7 +73,7 @@ DISTFILES = Makefile.in linux_sg3_err.h os2_srb.h sanei_DomainOS.c \
sanei_scsi.c sanei_thread.c sanei_usb.c sanei_pp.c \
sanei_wire.c test_wire.c sanei_access.c sanei_tcp.c sanei_udp.c
.PHONY: all check clean depend dist distclean install uninstall
.PHONY: all check clean depend dist distdir distclean install uninstall
.SUFFIXES:
.SUFFIXES: .c .o .lo
@ -114,9 +114,15 @@ distclean: clean
rm -f $(DISTCLEAN_FILES)
rm -f Makefile
dist: $(DISTFILES)
dist: distdir
distdir: $(DISTFILES)
for file in $(DISTFILES); do \
ln $$file $(distdir)/sanei 2> /dev/null \
|| cp -p $$file $(distdir)/sanei ; \
ln $(srcdir)/$$file $(distdir) 2> /dev/null \
|| cp -p $(srcdir)/$$file $(distdir) ; \
done
# Used by top level distcheck target
dvi:
check:
installcheck:
distuninstallcheck:

Wyświetl plik

@ -5,7 +5,7 @@ top_builddir = ..
PACKAGE = @PACKAGE@
VERSION = @VERSION@
distdir = $(top_srcdir)/$(PACKAGE)-$(VERSION)
distdir = $(top_srcdir)/$(PACKAGE)-$(VERSION)/testsuite
prefix = @prefix@
exec_prefix = @exec_prefix@
@ -84,9 +84,15 @@ distclean: clean
rm -f $(DISTCLEAN_FILES)
rm -f Makefile
dist: $(DISTFILES)
dist: distdir
distdir: $(DISTFILES)
for file in $(DISTFILES); do \
ln $$file $(distdir)/testsuite 2> /dev/null \
|| cp -p $$file $(distdir)/testsuite ; \
ln $(srcdir)/$$file $(distdir) 2> /dev/null \
|| cp -p $(srcdir)/$$file $(distdir) ; \
done
# Used by top level distcheck target
dvi:
check:
installcheck:
distuninstallcheck:

Wyświetl plik

@ -8,7 +8,7 @@ subdir = tools
PACKAGE = @PACKAGE@
VERSION = @VERSION@
distdir = $(top_srcdir)/$(PACKAGE)-$(VERSION)
distdir = $(top_srcdir)/$(PACKAGE)-$(VERSION)/tools
prefix = @prefix@
exec_prefix = @exec_prefix@
@ -78,7 +78,7 @@ DISTFILES = Makefile.in RenSaneDlls.cmd README libtool-get-dll-ext \
SUBDIRS = hotplug hotplug-ng udev hal
.PHONY: all clean depend dist distclean install uninstall
.PHONY: all clean depend dist distdir distclean install uninstall dirs
.c.o:
$(COMPILE) $<
@ -86,7 +86,12 @@ SUBDIRS = hotplug hotplug-ng udev hal
%.lo: %.c
@$(LIBTOOL) $(MCOMP) $(COMPILE) -DLIBDIR=$(libdir) $<
all: $(DESTINATIONS)
all: dirs $(DESTINATIONS)
dirs:
for subdir in $(SUBDIRS); do \
$(MKDIR) $$subdir || exit 1; \
done
install: sane-config sane-find-scanner gamma4scanimage
$(INSTALL_SCRIPT) sane-config $(DESTDIR)$(bindir)/sane-config
@ -94,7 +99,7 @@ install: sane-config sane-find-scanner gamma4scanimage
$(INSTALL_PROGRAM) gamma4scanimage $(DESTDIR)$(bindir)/gamma4scanimage
uninstall:
rm -f $(bindir)/sane-config $(bindir)/sane-find-scanner $(bindir)/gamma4scanimage
rm -f $(DESTDIR)$(bindir)/sane-config $(DESTDIR)$(bindir)/sane-find-scanner $(DESTDIR)$(bindir)/gamma4scanimage
sane-config: sane-config.in $(top_builddir)/config.status
cd $(top_builddir) \
@ -109,8 +114,8 @@ sane-find-scanner: sane-find-scanner.o check-usb-chip.o ../backend/sane_strstatu
gamma4scanimage: gamma4scanimage.o
@$(LIBTOOL) $(MLINK) $(LINK) gamma4scanimage.o -lm
../backend/umax_pp_low.o: ../backend/umax_pp_low.c
$(COMPILE) ../backend/umax_pp_low.c -o ../backend/umax_pp_low.o \
../backend/umax_pp_low.o: ${top_srcdir}/backend/umax_pp_low.c
$(COMPILE) ${top_srcdir}/backend/umax_pp_low.c -o ../backend/umax_pp_low.o \
-DBACKEND_NAME=umax_pp_low
umax_pp: umax_pp.o ../backend/umax_pp_low.o
@ -152,17 +157,23 @@ distclean: clean
( cd $$subdir ; rm -f $(DISTCLEAN_FILES) ); \
done
dist: $(DISTFILES)
dist: distdir
distdir: $(DISTFILES)
for subdir in $(SUBDIRS) ; do \
$(MKDIR) $(distdir)/tools/$${subdir} ; \
for file in $${subdir}/* ; do \
ln $$file $(distdir)/tools/$${subdir} 2> /dev/null \
|| cp -p $$file $(distdir)/tools/$${subdir} \
$(MKDIR) $(distdir)/$${subdir} ; \
for file in $(srcdir)/$${subdir}/* ; do \
ln $$file $(distdir)/$${subdir} 2> /dev/null \
|| cp -p $$file $(distdir)/$${subdir} \
|| echo "ignoring: $$file" ; \
done ; \
done
for file in $(DISTFILES); do \
ln $$file $(distdir)/tools 2> /dev/null \
|| cp -p $$file $(distdir)/tools ; \
ln $(srcdir)/$$file $(distdir) 2> /dev/null \
|| cp -p $(srcdir)/$$file $(distdir) ; \
done
# Used by top level distcheck target
dvi:
check:
installcheck:
distuninstallcheck: