PERFORCE change 144425 for review
Stacey Son
sson at FreeBSD.org
Tue Jul 1 15:26:26 UTC 2008
http://perforce.freebsd.org/chv.cgi?CH=144425
Change 144425 by sson at sson_amd64 on 2008/07/01 15:25:44
Fixed problem when building outside the source directories.
Affected files ...
.. //depot/projects/trustedbsd/openbsm/bin/audit/Makefile.am#3 edit
.. //depot/projects/trustedbsd/openbsm/bin/audit/Makefile.in#6 edit
.. //depot/projects/trustedbsd/openbsm/bin/audit/auditd_control.defs#2 delete
.. //depot/projects/trustedbsd/openbsm/bin/auditd/Makefile.am#3 edit
.. //depot/projects/trustedbsd/openbsm/bin/auditd/Makefile.in#6 edit
.. //depot/projects/trustedbsd/openbsm/bin/auditfilterd/Makefile.am#2 edit
.. //depot/projects/trustedbsd/openbsm/bin/auditfilterd/Makefile.in#3 edit
.. //depot/projects/trustedbsd/openbsm/bin/auditreduce/Makefile.am#2 edit
.. //depot/projects/trustedbsd/openbsm/bin/auditreduce/Makefile.in#5 edit
.. //depot/projects/trustedbsd/openbsm/bin/praudit/Makefile.am#2 edit
.. //depot/projects/trustedbsd/openbsm/bin/praudit/Makefile.in#5 edit
.. //depot/projects/trustedbsd/openbsm/libbsm/Makefile.am#4 edit
.. //depot/projects/trustedbsd/openbsm/libbsm/Makefile.in#6 edit
.. //depot/projects/trustedbsd/openbsm/modules/auditfilter_noop/Makefile.am#2 edit
.. //depot/projects/trustedbsd/openbsm/modules/auditfilter_noop/Makefile.in#3 edit
.. //depot/projects/trustedbsd/openbsm/test/bsm/Makefile.am#2 edit
.. //depot/projects/trustedbsd/openbsm/test/bsm/Makefile.in#3 edit
.. //depot/projects/trustedbsd/openbsm/tools/Makefile.am#3 edit
.. //depot/projects/trustedbsd/openbsm/tools/Makefile.in#6 edit
Differences ...
==== //depot/projects/trustedbsd/openbsm/bin/audit/Makefile.am#3 (text+ko) ====
@@ -1,8 +1,8 @@
#
-# $P4: //depot/projects/trustedbsd/openbsm/bin/audit/Makefile.am#2 $
+# $P4: //depot/projects/trustedbsd/openbsm/bin/audit/Makefile.am#3 $
#
-INCLUDES = -I$(top_srcdir)
+INCLUDES = -I$(top_builddir) -I$(top_srcdir)
sbin_PROGRAMS = audit
audit_LDADD = $(top_builddir)/libbsm/libbsm.la
@@ -12,8 +12,8 @@
audit_SOURCES = auditd_control_user.c audit.c
CLEANFILES = auditd_control_user.c auditd_control_user.h
-auditd_control_user.c: auditd_control.defs
- $(MIG) -user auditd_control_user.c -header auditd_control_user.h -server /dev/null -sheader /dev/null auditd_control.defs
+auditd_control_user.c: $(top_srcdir)/bin/auditd/auditd_control.defs
+ $(MIG) -user auditd_control_user.c -header auditd_control_user.h -server /dev/null -sheader /dev/null $(top_srcdir)/bin/auditd/auditd_control.defs
else
audit_SOURCES = audit.c
endif
==== //depot/projects/trustedbsd/openbsm/bin/audit/Makefile.in#6 (text+ko) ====
@@ -15,7 +15,7 @@
@SET_MAKE@
#
-# $P4: //depot/projects/trustedbsd/openbsm/bin/audit/Makefile.in#5 $
+# $P4: //depot/projects/trustedbsd/openbsm/bin/audit/Makefile.in#6 $
#
VPATH = @srcdir@
@@ -127,6 +127,7 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
RANLIB = @RANLIB@
+SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
@@ -182,7 +183,7 @@
target_alias = @target_alias@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-INCLUDES = -I$(top_srcdir)
+INCLUDES = -I$(top_builddir) -I$(top_srcdir)
audit_LDADD = $(top_builddir)/libbsm/libbsm.la
man8_MANS = audit.8
@USE_MACH_IPC_FALSE at audit_SOURCES = audit.c
@@ -519,8 +520,8 @@
uninstall-sbinPROGRAMS
- at USE_MACH_IPC_TRUE@auditd_control_user.c: auditd_control.defs
- at USE_MACH_IPC_TRUE@ $(MIG) -user auditd_control_user.c -header auditd_control_user.h -server /dev/null -sheader /dev/null auditd_control.defs
+ at USE_MACH_IPC_TRUE@auditd_control_user.c: $(top_srcdir)/bin/auditd/auditd_control.defs
+ at USE_MACH_IPC_TRUE@ $(MIG) -user auditd_control_user.c -header auditd_control_user.h -server /dev/null -sheader /dev/null $(top_srcdir)/bin/auditd/auditd_control.defs
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
==== //depot/projects/trustedbsd/openbsm/bin/auditd/Makefile.am#3 (text+ko) ====
@@ -1,8 +1,8 @@
#
-# $P4: //depot/projects/trustedbsd/openbsm/bin/auditd/Makefile.am#2 $
+# $P4: //depot/projects/trustedbsd/openbsm/bin/auditd/Makefile.am#3 $
#
-INCLUDES = -I$(top_srcdir)
+INCLUDES = -I$(top_builddir) -I$(top_srcdir)
sbin_PROGRAMS = auditd
auditd_LDADD = $(top_builddir)/libbsm/libbsm.la
@@ -13,10 +13,10 @@
CLEANFILES = auditd_control_server.c auditd_control_server.h audit_triggers_server.c audit_triggers_server.h
auditd_control_server.c: auditd_control.defs
- $(MIG) -user /dev/null -header /dev/null -server auditd_control_server.c -sheader auditd_control_server.h auditd_control.defs
+ $(MIG) -user /dev/null -header /dev/null -server auditd_control_server.c -sheader auditd_control_server.h $(top_srcdir)/bin/auditd/auditd_control.defs
audit_triggers_server.c: audit_triggers.defs
- $(MIG) -user /dev/null -header /dev/null -server audit_triggers_server.c -sheader audit_triggers_server.h audit_triggers.defs
+ $(MIG) -user /dev/null -header /dev/null -server audit_triggers_server.c -sheader audit_triggers_server.h $(top_srcdir)/bin/auditd/audit_triggers.defs
else
auditd_SOURCES = audit_warn.c auditd.c
endif
==== //depot/projects/trustedbsd/openbsm/bin/auditd/Makefile.in#6 (text+ko) ====
@@ -15,7 +15,7 @@
@SET_MAKE@
#
-# $P4: //depot/projects/trustedbsd/openbsm/bin/auditd/Makefile.in#5 $
+# $P4: //depot/projects/trustedbsd/openbsm/bin/auditd/Makefile.in#6 $
#
VPATH = @srcdir@
@@ -186,7 +186,7 @@
target_alias = @target_alias@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-INCLUDES = -I$(top_srcdir)
+INCLUDES = -I$(top_builddir) -I$(top_srcdir)
auditd_LDADD = $(top_builddir)/libbsm/libbsm.la
man8_MANS = auditd.8
@USE_MACH_IPC_FALSE at auditd_SOURCES = audit_warn.c auditd.c
@@ -526,10 +526,10 @@
@USE_MACH_IPC_TRUE at auditd_control_server.c: auditd_control.defs
- at USE_MACH_IPC_TRUE@ $(MIG) -user /dev/null -header /dev/null -server auditd_control_server.c -sheader auditd_control_server.h auditd_control.defs
+ at USE_MACH_IPC_TRUE@ $(MIG) -user /dev/null -header /dev/null -server auditd_control_server.c -sheader auditd_control_server.h $(top_srcdir)/bin/auditd/auditd_control.defs
@USE_MACH_IPC_TRUE at audit_triggers_server.c: audit_triggers.defs
- at USE_MACH_IPC_TRUE@ $(MIG) -user /dev/null -header /dev/null -server audit_triggers_server.c -sheader audit_triggers_server.h audit_triggers.defs
+ at USE_MACH_IPC_TRUE@ $(MIG) -user /dev/null -header /dev/null -server audit_triggers_server.c -sheader audit_triggers_server.h $(top_srcdir)/bin/auditd/audit_triggers.defs
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
==== //depot/projects/trustedbsd/openbsm/bin/auditfilterd/Makefile.am#2 (text+ko) ====
@@ -1,8 +1,8 @@
#
-# $P4: //depot/projects/trustedbsd/openbsm/bin/auditfilterd/Makefile.am#1 $
+# $P4: //depot/projects/trustedbsd/openbsm/bin/auditfilterd/Makefile.am#2 $
#
-INCLUDES = -I$(top_srcdir)
+INCLUDES = -I$(top_builddir) -I$(top_srcdir)
sbin_PROGRAMS = auditfilterd
auditfilterd_SOURCES = auditfilterd_conf.c auditfilterd.c
==== //depot/projects/trustedbsd/openbsm/bin/auditfilterd/Makefile.in#3 (text+ko) ====
@@ -15,7 +15,7 @@
@SET_MAKE@
#
-# $P4: //depot/projects/trustedbsd/openbsm/bin/auditfilterd/Makefile.in#2 $
+# $P4: //depot/projects/trustedbsd/openbsm/bin/auditfilterd/Makefile.in#3 $
#
VPATH = @srcdir@
@@ -114,6 +114,7 @@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
+MIG = @MIG@
MKDIR_P = @MKDIR_P@
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
@@ -124,7 +125,6 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
RANLIB = @RANLIB@
-SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
@@ -180,7 +180,7 @@
target_alias = @target_alias@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-INCLUDES = -I$(top_srcdir)
+INCLUDES = -I$(top_builddir) -I$(top_srcdir)
auditfilterd_SOURCES = auditfilterd_conf.c auditfilterd.c
auditfilterd_LDADD = $(top_builddir)/libbsm/libbsm.la
man8_MANS = auditfilterd.8
@@ -197,9 +197,9 @@
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign bin/auditfilterd/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu bin/auditfilterd/Makefile'; \
cd $(top_srcdir) && \
- $(AUTOMAKE) --foreign bin/auditfilterd/Makefile
+ $(AUTOMAKE) --gnu bin/auditfilterd/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
==== //depot/projects/trustedbsd/openbsm/bin/auditreduce/Makefile.am#2 (text+ko) ====
@@ -1,8 +1,8 @@
#
-# $P4: //depot/projects/trustedbsd/openbsm/bin/auditreduce/Makefile.am#1 $
+# $P4: //depot/projects/trustedbsd/openbsm/bin/auditreduce/Makefile.am#2 $
#
-INCLUDES = -I$(top_srcdir)
+INCLUDES = -I$(top_builddir) -I$(top_srcdir)
sbin_PROGRAMS = auditreduce
auditreduce_SOURCES = auditreduce.c
==== //depot/projects/trustedbsd/openbsm/bin/auditreduce/Makefile.in#5 (text+ko) ====
@@ -15,7 +15,7 @@
@SET_MAKE@
#
-# $P4: //depot/projects/trustedbsd/openbsm/bin/auditreduce/Makefile.in#4 $
+# $P4: //depot/projects/trustedbsd/openbsm/bin/auditreduce/Makefile.in#5 $
#
VPATH = @srcdir@
@@ -113,6 +113,7 @@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
+MIG = @MIG@
MKDIR_P = @MKDIR_P@
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
@@ -123,7 +124,6 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
RANLIB = @RANLIB@
-SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
@@ -179,7 +179,7 @@
target_alias = @target_alias@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-INCLUDES = -I$(top_srcdir)
+INCLUDES = -I$(top_builddir) -I$(top_srcdir)
auditreduce_SOURCES = auditreduce.c
auditreduce_LDADD = $(top_builddir)/libbsm/libbsm.la
man1_MANS = auditreduce.1
@@ -196,9 +196,9 @@
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign bin/auditreduce/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu bin/auditreduce/Makefile'; \
cd $(top_srcdir) && \
- $(AUTOMAKE) --foreign bin/auditreduce/Makefile
+ $(AUTOMAKE) --gnu bin/auditreduce/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
==== //depot/projects/trustedbsd/openbsm/bin/praudit/Makefile.am#2 (text+ko) ====
@@ -1,8 +1,8 @@
#
-# $P4: //depot/projects/trustedbsd/openbsm/bin/praudit/Makefile.am#1 $
+# $P4: //depot/projects/trustedbsd/openbsm/bin/praudit/Makefile.am#2 $
#
-INCLUDES = -I$(top_srcdir)
+INCLUDES = -I$(top_builddir) -I$(top_srcdir)
sbin_PROGRAMS = praudit
praudit_SOURCES = praudit.c
==== //depot/projects/trustedbsd/openbsm/bin/praudit/Makefile.in#5 (text+ko) ====
@@ -15,7 +15,7 @@
@SET_MAKE@
#
-# $P4: //depot/projects/trustedbsd/openbsm/bin/praudit/Makefile.in#4 $
+# $P4: //depot/projects/trustedbsd/openbsm/bin/praudit/Makefile.in#5 $
#
VPATH = @srcdir@
@@ -113,6 +113,7 @@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
+MIG = @MIG@
MKDIR_P = @MKDIR_P@
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
@@ -123,7 +124,6 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
RANLIB = @RANLIB@
-SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
@@ -179,7 +179,7 @@
target_alias = @target_alias@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-INCLUDES = -I$(top_srcdir)
+INCLUDES = -I$(top_builddir) -I$(top_srcdir)
praudit_SOURCES = praudit.c
praudit_LDADD = $(top_builddir)/libbsm/libbsm.la
man1_MANS = praudit.1
@@ -196,9 +196,9 @@
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign bin/praudit/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu bin/praudit/Makefile'; \
cd $(top_srcdir) && \
- $(AUTOMAKE) --foreign bin/praudit/Makefile
+ $(AUTOMAKE) --gnu bin/praudit/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
==== //depot/projects/trustedbsd/openbsm/libbsm/Makefile.am#4 (text+ko) ====
@@ -1,8 +1,8 @@
#
-# $P4: //depot/projects/trustedbsd/openbsm/libbsm/Makefile.am#3 $
+# $P4: //depot/projects/trustedbsd/openbsm/libbsm/Makefile.am#4 $
#
-INCLUDES = -I$(top_srcdir)
+INCLUDES = -I$(top_builddir) -I$(top_srcdir)
lib_LTLIBRARIES = libbsm.la
==== //depot/projects/trustedbsd/openbsm/libbsm/Makefile.in#6 (text+ko) ====
@@ -15,7 +15,7 @@
@SET_MAKE@
#
-# $P4: //depot/projects/trustedbsd/openbsm/libbsm/Makefile.in#5 $
+# $P4: //depot/projects/trustedbsd/openbsm/libbsm/Makefile.in#6 $
#
VPATH = @srcdir@
@@ -129,6 +129,7 @@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
+MIG = @MIG@
MKDIR_P = @MKDIR_P@
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
@@ -139,7 +140,6 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
RANLIB = @RANLIB@
-SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
@@ -195,7 +195,7 @@
target_alias = @target_alias@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-INCLUDES = -I$(top_srcdir)
+INCLUDES = -I$(top_builddir) -I$(top_srcdir)
lib_LTLIBRARIES = libbsm.la
libbsm_la_SOURCES = bsm_audit.c bsm_class.c bsm_control.c bsm_event.c \
bsm_flags.c bsm_io.c bsm_mask.c bsm_token.c bsm_user.c \
@@ -225,9 +225,9 @@
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign libbsm/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu libbsm/Makefile'; \
cd $(top_srcdir) && \
- $(AUTOMAKE) --foreign libbsm/Makefile
+ $(AUTOMAKE) --gnu libbsm/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
==== //depot/projects/trustedbsd/openbsm/modules/auditfilter_noop/Makefile.am#2 (text+ko) ====
@@ -1,8 +1,8 @@
#
-# $P4: //depot/projects/trustedbsd/openbsm/modules/auditfilter_noop/Makefile.am#1 $
+# $P4: //depot/projects/trustedbsd/openbsm/modules/auditfilter_noop/Makefile.am#2 $
#
-INCLUDES = -I$(top_srcdir)
+INCLUDES = -I$(top_builddir) -I$(top_srcdir)
lib_LTLIBRARIES = auditfilter_noop.la
==== //depot/projects/trustedbsd/openbsm/modules/auditfilter_noop/Makefile.in#3 (text+ko) ====
@@ -15,7 +15,7 @@
@SET_MAKE@
#
-# $P4: //depot/projects/trustedbsd/openbsm/modules/auditfilter_noop/Makefile.in#2 $
+# $P4: //depot/projects/trustedbsd/openbsm/modules/auditfilter_noop/Makefile.in#3 $
#
VPATH = @srcdir@
@@ -118,6 +118,7 @@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
+MIG = @MIG@
MKDIR_P = @MKDIR_P@
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
@@ -128,7 +129,6 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
RANLIB = @RANLIB@
-SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
@@ -184,7 +184,7 @@
target_alias = @target_alias@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-INCLUDES = -I$(top_srcdir)
+INCLUDES = -I$(top_builddir) -I$(top_srcdir)
lib_LTLIBRARIES = auditfilter_noop.la
auditfilter_noop_la_SOURCE = auditfilter_noop.c
auditfilter_noop_la_LDFLAGS = -module
@@ -201,9 +201,9 @@
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign modules/auditfilter_noop/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu modules/auditfilter_noop/Makefile'; \
cd $(top_srcdir) && \
- $(AUTOMAKE) --foreign modules/auditfilter_noop/Makefile
+ $(AUTOMAKE) --gnu modules/auditfilter_noop/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
==== //depot/projects/trustedbsd/openbsm/test/bsm/Makefile.am#2 (text+ko) ====
@@ -1,8 +1,8 @@
#
-# $P4: //depot/projects/trustedbsd/openbsm/test/bsm/Makefile.am#1 $
+# $P4: //depot/projects/trustedbsd/openbsm/test/bsm/Makefile.am#2 $
#
-INCLUDES = -I$(top_srcdir)
+INCLUDES = -I$(top_builddir) -I$(top_srcdir)
bin_PROGRAMS = generate
generate_SOURCES = generate.c
==== //depot/projects/trustedbsd/openbsm/test/bsm/Makefile.in#3 (text+ko) ====
@@ -15,7 +15,7 @@
@SET_MAKE@
#
-# $P4: //depot/projects/trustedbsd/openbsm/test/bsm/Makefile.in#2 $
+# $P4: //depot/projects/trustedbsd/openbsm/test/bsm/Makefile.in#3 $
#
VPATH = @srcdir@
@@ -110,6 +110,7 @@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
+MIG = @MIG@
MKDIR_P = @MKDIR_P@
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
@@ -120,7 +121,6 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
RANLIB = @RANLIB@
-SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
@@ -176,7 +176,7 @@
target_alias = @target_alias@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-INCLUDES = -I$(top_srcdir)
+INCLUDES = -I$(top_builddir) -I$(top_srcdir)
generate_SOURCES = generate.c
generate_LDADD = $(top_builddir)/libbsm/libbsm.la
all: all-am
@@ -192,9 +192,9 @@
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign test/bsm/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu test/bsm/Makefile'; \
cd $(top_srcdir) && \
- $(AUTOMAKE) --foreign test/bsm/Makefile
+ $(AUTOMAKE) --gnu test/bsm/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
==== //depot/projects/trustedbsd/openbsm/tools/Makefile.am#3 (text+ko) ====
@@ -1,8 +1,8 @@
#
-# $P4: //depot/projects/trustedbsd/openbsm/tools/Makefile.am#2 $
+# $P4: //depot/projects/trustedbsd/openbsm/tools/Makefile.am#3 $
#
-INCLUDES = -I$(top_srcdir)
+INCLUDES = -I$(top_builddir) -I$(top_srcdir)
bin_PROGRAMS = audump
audump_SOURCES = audump.c
==== //depot/projects/trustedbsd/openbsm/tools/Makefile.in#6 (text+ko) ====
@@ -15,7 +15,7 @@
@SET_MAKE@
#
-# $P4: //depot/projects/trustedbsd/openbsm/tools/Makefile.in#5 $
+# $P4: //depot/projects/trustedbsd/openbsm/tools/Makefile.in#6 $
#
VPATH = @srcdir@
@@ -110,6 +110,7 @@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
+MIG = @MIG@
MKDIR_P = @MKDIR_P@
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
@@ -120,7 +121,6 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
RANLIB = @RANLIB@
-SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
@@ -176,7 +176,7 @@
target_alias = @target_alias@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-INCLUDES = -I$(top_srcdir)
+INCLUDES = -I$(top_builddir) -I$(top_srcdir)
audump_SOURCES = audump.c
audump_LDADD = $(top_builddir)/libbsm/libbsm.la
all: all-am
@@ -192,9 +192,9 @@
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign tools/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu tools/Makefile'; \
cd $(top_srcdir) && \
- $(AUTOMAKE) --foreign tools/Makefile
+ $(AUTOMAKE) --gnu tools/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
More information about the p4-projects
mailing list