summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2008-02-11 14:48:39 +0100
committerJelmer Vernooij <jelmer@samba.org>2008-02-11 15:19:24 +0100
commit6034757963eef7748db258093c3b72289d2cea76 (patch)
treeece1c1902881bb1ec4678e8a71bff85eb912404a
parente54f9c77492827242a8857e95c552a6b94bdb959 (diff)
downloadsamba-6034757963eef7748db258093c3b72289d2cea76.tar.gz
samba-6034757963eef7748db258093c3b72289d2cea76.tar.bz2
samba-6034757963eef7748db258093c3b72289d2cea76.zip
Move pidl bits to a separate file.
(This used to be commit de7af6913487b51e44463bf1908e765477d28e5d)
-rw-r--r--source4/Makefile42
-rw-r--r--source4/pidl/config.mk36
2 files changed, 42 insertions, 36 deletions
diff --git a/source4/Makefile b/source4/Makefile
index 3aebc831af..e734b01834 100644
--- a/source4/Makefile
+++ b/source4/Makefile
@@ -1,4 +1,6 @@
#!gmake
+# The Samba 4 Makefile.
+# This file is *NOT* autogenerated.
include mkconfig.mk
@@ -68,8 +70,8 @@ showflags::
# The permissions to give the executables
INSTALLPERMS = 0755
-install:: showlayout everything installbin installdat installswat installmisc installlib \
- installheader installpc installplugins
+install:: showlayout everything installbin installdat installswat installmisc \
+ installlib installheader installpc installplugins
# DESTDIR is used here to prevent packagers wasting their time
# duplicating the Makefile. Remove it and you will have the privilege
@@ -165,41 +167,9 @@ uninstallman::
data.mk: config.status $(MK_FILES)
./config.status
-pidl/Makefile: pidl/Makefile.PL
- cd pidl && $(PERL) Makefile.PL
-
-testcov-html:: pidl-testcov
-
-pidl-testcov: pidl/Makefile
- cd pidl && cover -test
-
-installpidl:: pidl/Makefile
- $(MAKE) -C pidl install
-
-uninstallpidl:: pidl/Makefile
- $(MAKE) -C pidl uninstall
-
-$(IDL_HEADER_FILES) \
- $(IDL_NDR_PARSE_H_FILES) $(IDL_NDR_PARSE_C_FILES) \
- $(IDL_NDR_CLIENT_C_FILES) $(IDL_NDR_CLIENT_H_FILES) \
- $(IDL_NDR_SERVER_C_FILES) $(IDL_SWIG_FILES) \
- $(IDL_NDR_EJS_C_FILES) $(IDL_NDR_EJS_H_FILES) \
- $(IDL_NDR_PY_C_FILES) $(IDL_NDR_PY_H_FILES): idl
-
-idl_full:: pidl/lib/Parse/Pidl/IDL.pm pidl/lib/Parse/Pidl/Expr.pm
- @CPP="$(CPP)" PERL="$(PERL)" srcdir=$(srcdir) $(srcdir)/script/build_idl.sh FULL
-
-idl:: pidl/lib/Parse/Pidl/IDL.pm pidl/lib/Parse/Pidl/Expr.pm
- @CPP="$(CPP)" PERL="$(PERL)" srcdir=$(srcdir) $(srcdir)/script/build_idl.sh PARTIAL
-
-pidl/lib/Parse/Pidl/IDL.pm: pidl/idl.yp
- -$(YAPP) -m 'Parse::Pidl::IDL' -o pidl/lib/Parse/Pidl/IDL.pm pidl/idl.yp ||\
- touch pidl/lib/Parse/Pidl/IDL.pm
-
-pidl/lib/Parse/Pidl/Expr.pm: pidl/idl.yp
- -$(YAPP) -m 'Parse::Pidl::Expr' -o pidl/lib/Parse/Pidl/Expr.pm pidl/expr.yp ||\
- touch pidl/lib/Parse/Pidl/Expr.pm
+testcov-html::
+include pidl/config.mk
include selftest/config.mk
include rules.mk
diff --git a/source4/pidl/config.mk b/source4/pidl/config.mk
new file mode 100644
index 0000000000..3793008319
--- /dev/null
+++ b/source4/pidl/config.mk
@@ -0,0 +1,36 @@
+pidl/Makefile: pidl/Makefile.PL
+ cd pidl && $(PERL) Makefile.PL
+
+pidl-testcov: pidl/Makefile
+ cd pidl && cover -test
+
+installpidl:: pidl/Makefile
+ $(MAKE) -C pidl install
+
+uninstallpidl:: pidl/Makefile
+ $(MAKE) -C pidl uninstall
+
+idl_full:: pidl/lib/Parse/Pidl/IDL.pm pidl/lib/Parse/Pidl/Expr.pm
+ @CPP="$(CPP)" PERL="$(PERL)" srcdir=$(srcdir) $(srcdir)/script/build_idl.sh FULL
+
+idl:: pidl/lib/Parse/Pidl/IDL.pm pidl/lib/Parse/Pidl/Expr.pm
+ @CPP="$(CPP)" PERL="$(PERL)" srcdir=$(srcdir) $(srcdir)/script/build_idl.sh PARTIAL
+
+pidl/lib/Parse/Pidl/IDL.pm: pidl/idl.yp
+ -$(YAPP) -m 'Parse::Pidl::IDL' -o pidl/lib/Parse/Pidl/IDL.pm pidl/idl.yp ||\
+ touch pidl/lib/Parse/Pidl/IDL.pm
+
+pidl/lib/Parse/Pidl/Expr.pm: pidl/idl.yp
+ -$(YAPP) -m 'Parse::Pidl::Expr' -o pidl/lib/Parse/Pidl/Expr.pm pidl/expr.yp ||\
+ touch pidl/lib/Parse/Pidl/Expr.pm
+
+testcov-html:: pidl-testcov
+
+$(IDL_HEADER_FILES) \
+ $(IDL_NDR_PARSE_H_FILES) $(IDL_NDR_PARSE_C_FILES) \
+ $(IDL_NDR_CLIENT_C_FILES) $(IDL_NDR_CLIENT_H_FILES) \
+ $(IDL_NDR_SERVER_C_FILES) $(IDL_SWIG_FILES) \
+ $(IDL_NDR_EJS_C_FILES) $(IDL_NDR_EJS_H_FILES) \
+ $(IDL_NDR_PY_C_FILES) $(IDL_NDR_PY_H_FILES): idl
+
+