projects
/
debian
/
amanda
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge commit 'upstream/3.3.0'
[debian/amanda]
/
oldrecover-src
/
Makefile.am
diff --git
a/oldrecover-src/Makefile.am
b/oldrecover-src/Makefile.am
index 8a0472d4b3af50c8ed01d3d4eaa9fd02008d8883..24ec01722272c6964556b1fd7212aee556765830 100644
(file)
--- a/
oldrecover-src/Makefile.am
+++ b/
oldrecover-src/Makefile.am
@@
-1,5
+1,6
@@
# Makefile for Amanda file recovery programs.
# Makefile for Amanda file recovery programs.
+include $(top_srcdir)/config/automake/vars.am
include $(top_srcdir)/config/automake/installperms.am
include $(top_srcdir)/config/automake/precompile.am
include $(top_srcdir)/config/automake/installperms.am
include $(top_srcdir)/config/automake/precompile.am
@@
-11,10
+12,8
@@
INCLUDES = -I$(top_builddir)/common-src \
AM_CFLAGS = $(AMANDA_WARNING_CFLAGS)
AM_LDFLAGS = $(AMANDA_STATIC_LDFLAGS)
AM_CFLAGS = $(AMANDA_WARNING_CFLAGS)
AM_LDFLAGS = $(AMANDA_STATIC_LDFLAGS)
-LINT=@AMLINT@
-LINTFLAGS=@AMLINTFLAGS@
-
-LIB_EXTENSION = la
+LINT=$(AMLINT)
+LINTFLAGS=$(AMLINTFLAGS)
sbin_PROGRAMS = amoldrecover
sbin_PROGRAMS = amoldrecover
@@
-25,12
+24,11
@@
sbin_PROGRAMS = amoldrecover
# routines, and second to pick up any references in the other libraries.
###
# routines, and second to pick up any references in the other libraries.
###
-LDADD = ../common-src/libamanda.
$(LIB_EXTENSION)
\
+LDADD = ../common-src/libamanda.
la
\
@LEXLIB@ \
$(READLINE_LIBS) \
@LEXLIB@ \
$(READLINE_LIBS) \
- ../client-src/libamclient.$(LIB_EXTENSION) \
- ../common-src/libamanda.$(LIB_EXTENSION) \
- ../gnulib/libgnu.$(LIB_EXTENSION)
+ ../client-src/libamclient.la \
+ ../common-src/libamanda.la
amoldrecover_CSRC = amrecover.c \
display_commands.c extract_list.c \
amoldrecover_CSRC = amrecover.c \
display_commands.c extract_list.c \
@@
-55,9
+53,6
@@
uparse.$(OBJEXT): uparse.c
$(CC) $(CFLAGS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(CPPFLAGS) -c $<
$(CC) $(CFLAGS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(CPPFLAGS) -c $<
-INSTALLPERMS_exec = \
- dest=$(sbindir) chown=amanda chmod=o-rwx $(sbin_PROGRAMS)
-
lint:
@ f="$(amoldrecover_CSRC)"; \
(cd ../common-src; make listlibsrc); \
lint:
@ f="$(amoldrecover_CSRC)"; \
(cd ../common-src; make listlibsrc); \