From 1e76b85c23f78aa080274ff624b1cf6f7626e3cc Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Tue, 17 May 2005 01:13:53 +0000 Subject: r6842: Move to .mk file (This used to be commit 77f9c471eaad71e6adf0371de206ed879daca2d8) --- source4/build/smb_build/main.pm | 1 + source4/configure.in | 1 - source4/param/config.m4 | 4 ---- source4/param/config.mk | 5 +++++ 4 files changed, 6 insertions(+), 5 deletions(-) delete mode 100644 source4/param/config.m4 create mode 100644 source4/param/config.mk diff --git a/source4/build/smb_build/main.pm b/source4/build/smb_build/main.pm index a1943f581a..2fcd4594ac 100644 --- a/source4/build/smb_build/main.pm +++ b/source4/build/smb_build/main.pm @@ -40,6 +40,7 @@ sub smb_build_main($) "lib/popt/config.mk", "lib/cmdline/config.mk", "lib/socket_wrapper/config.mk", + "param/config.mk", "smb_server/config.mk", "rpc_server/config.mk", "ldap_server/config.mk", diff --git a/source4/configure.in b/source4/configure.in index 0aff3be8c5..68fddc99db 100644 --- a/source4/configure.in +++ b/source4/configure.in @@ -19,7 +19,6 @@ SMB_INCLUDE_M4(lib/tdb/config.m4) SMB_INCLUDE_M4(lib/ldb/config.m4) SMB_INCLUDE_M4(lib/events/config.m4) SMB_INCLUDE_M4(lib/cmdline/config.m4) -SMB_INCLUDE_M4(param/config.m4) SMB_INCLUDE_M4(auth/kerberos/config.m4) SMB_INCLUDE_M4(auth/gensec/config.m4) SMB_INCLUDE_M4(libcli/config.m4) diff --git a/source4/param/config.m4 b/source4/param/config.m4 deleted file mode 100644 index b93886e837..0000000000 --- a/source4/param/config.m4 +++ /dev/null @@ -1,4 +0,0 @@ -################################################# - -SMB_SUBSYSTEM(CONFIG,[dynconfig.o], - [param/loadparm.o param/params.o passdb/secrets.o]) \ No newline at end of file diff --git a/source4/param/config.mk b/source4/param/config.mk new file mode 100644 index 0000000000..1f5b636754 --- /dev/null +++ b/source4/param/config.mk @@ -0,0 +1,5 @@ +[SUBSYSTEM::CONFIG] +INIT_OBJ_FILES = dynconfig.o +ADD_OBJ_FILES = param/loadparm.o \ + param/params.o \ + passdb/secrets.o -- cgit