svn commit: samba r9049 - in branches/SAMBA_4_0/source: .
build/smb_build heimdal_build
metze at samba.org
metze at samba.org
Thu Aug 4 04:45:43 GMT 2005
Author: metze
Date: 2005-08-04 04:45:42 +0000 (Thu, 04 Aug 2005)
New Revision: 9049
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=9049
Log:
- add property dependencies to include/proto.h
- make some stuff easier
metze
Modified:
branches/SAMBA_4_0/source/build/smb_build/makefile.pm
branches/SAMBA_4_0/source/heimdal_build/config.mk
branches/SAMBA_4_0/source/main.mk
Changeset:
Modified: branches/SAMBA_4_0/source/build/smb_build/makefile.pm
===================================================================
--- branches/SAMBA_4_0/source/build/smb_build/makefile.pm 2005-08-04 04:24:37 UTC (rev 9048)
+++ branches/SAMBA_4_0/source/build/smb_build/makefile.pm 2005-08-04 04:45:42 UTC (rev 9049)
@@ -466,34 +466,12 @@
";
}
-sub _prepare_proto_rules()
+sub _prepare_clean_rules()
{
my $output = << '__EOD__';
-# Making this target will just make sure that the prototype files
-# exist, not necessarily that they are up to date. Since they're
-# removed by 'make clean' this will always be run when you do anything
-# afterwards.
-proto_exists: include/proto.h
-
-delheaders: pch_clean
- -rm -f $(builddir)/include/proto.h
-
-include/proto.h:
- @cd $(srcdir) && $(SHELL) script/mkproto.sh "$(PERL)" \
- -h _PROTO_H_ $(builddir)/include/proto.h \
- $(PROTO_PROTO_OBJS)
-
-# 'make headers' or 'make proto' calls a subshell because we need to
-# make sure these commands are executed in sequence even for a
-# parallel make.
-headers: delheaders proto_exists
-
-proto: idl headers
-
-proto_test:
- @[ -f $(builddir)/include/proto.h ] || $(MAKE) proto
-
-clean: delheaders heimdal_clean
+clean: heimdal_clean
+ @echo Removing headers
+ @-rm -f include/proto.h
@echo Removing objects
@-find . -name '*.o' -exec rm -f '{}' \;
@echo Removing binaries
@@ -577,7 +555,7 @@
($output .= _prepare_custom_rule($key) ) if $key->{TYPE} eq "TARGET";
}
- $output .= _prepare_proto_rules();
+ $output .= _prepare_clean_rules();
return $output;
}
Modified: branches/SAMBA_4_0/source/heimdal_build/config.mk
===================================================================
--- branches/SAMBA_4_0/source/heimdal_build/config.mk 2005-08-04 04:24:37 UTC (rev 9048)
+++ branches/SAMBA_4_0/source/heimdal_build/config.mk 2005-08-04 04:45:42 UTC (rev 9049)
@@ -395,6 +395,18 @@
include ./heimdal_build/et_deps.pl heimdal/lib/krb5/k524_err.et|
include ./heimdal_build/et_deps.pl heimdal/lib/krb5/krb5_err.et|
+heimdal_basics: \
+ heimdal/lib/hdb/hdb_asn1.h \
+ heimdal/lib/gssapi/spnego_asn1.h \
+ heimdal/lib/asn1/krb5_asn1.h \
+ heimdal/lib/roken/vis.h \
+ heimdal/lib/roken/err.h \
+ heimdal/lib/asn1/asn1_err.h \
+ heimdal/lib/hdb/hdb_err.h \
+ heimdal/lib/krb5/heim_err.h \
+ heimdal/lib/krb5/k524_err.h \
+ heimdal/lib/krb5/krb5_err.h
+
heimdal_clean:
@echo Removing generated ASN1 files
@-find heimdal/lib/asn1 -name 'asn1_*.[cx]' -exec rm -f '{}' \;
Modified: branches/SAMBA_4_0/source/main.mk
===================================================================
--- branches/SAMBA_4_0/source/main.mk 2005-08-04 04:24:37 UTC (rev 9048)
+++ branches/SAMBA_4_0/source/main.mk 2005-08-04 04:45:42 UTC (rev 9049)
@@ -52,7 +52,7 @@
include lib/replace/config.mk
include scripting/ejs/config.mk
-all: proto bin/asn1_compile bin/compile_et basics binaries
+all: binary_asn1_compile binary_compile_et binaries
binaries: $(BIN_PROGS) $(SBIN_PROGS)
manpages: $(MANPAGES)
everything: all
@@ -141,13 +141,26 @@
build/pidl/smb_interfaces.pm: build/pidl/smb_interfaces.yp
-yapp -s -m 'smb_interfaces' -o build/pidl/smb_interfaces.pm build/pidl/smb_interfaces.yp
+include/config.h:
+ @echo "include/config.h not present"
+ @echo "You need to rerun ./autogen.sh and ./configure"
+ @/bin/false
+
+include/proto.h: $(PROTO_PROTO_OBJS:.o=.c)
+ @-rm -f include/includes.h.gch
+ @$(SHELL) script/mkproto.sh "$(PERL)" \
+ -h _PROTO_H_ include/proto.h \
+ $(PROTO_PROTO_OBJS)
+ @touch include/proto.h
+
+proto: include/proto.h
pch: proto include/includes.h.gch
-pch_clean:
- -rm -f include/includes.h.gch
+basics: include/config.h \
+ include/proto.h \
+ idl \
+ heimdal_basics
-basics: idl proto_exists heimdal/lib/hdb/hdb_asn1.h heimdal/lib/gssapi/spnego_asn1.h heimdal/lib/asn1/krb5_asn1.h heimdal/lib/roken/vis.h heimdal/lib/roken/err.h heimdal/lib/asn1/asn1_err.h heimdal/lib/hdb/hdb_err.h heimdal/lib/krb5/heim_err.h heimdal/lib/krb5/k524_err.h heimdal/lib/krb5/krb5_err.h
-
test: $(DEFAULT_TEST_TARGET)
test-swrap: all
More information about the samba-cvs
mailing list