From a742e0065aee09499b60f3762af50f180c42c855 Mon Sep 17 00:00:00 2001
From: Günther Deschner <gd@samba.org>
Date: Sun, 26 Sep 2010 20:10:49 +0200
Subject: s3-waf: move perfcount subsystem to modules/wscript_build.

Guenther
---
 source3/modules/wscript_build | 23 +++++++++++++++++++++++
 source3/wscript_build         | 23 -----------------------
 2 files changed, 23 insertions(+), 23 deletions(-)

(limited to 'source3')

diff --git a/source3/modules/wscript_build b/source3/modules/wscript_build
index 076992de10..c751c08136 100644
--- a/source3/modules/wscript_build
+++ b/source3/modules/wscript_build
@@ -442,3 +442,26 @@ bld.SAMBA_MODULE('CHARSET_MACOSXFS',
                  init_function='',
                  internal_module=bld.SAMBA3_IS_STATIC_MODULE('CHARSET_MACOSXFS'),
                  enabled=bld.SAMBA3_IS_ENABLED_MODULE('CHARSET_MACOSXFS'))
+
+
+PERFCOUNT_ONEFS_SRC = 'perfcount_onefs.c'
+PERFCOUNT_TEST_SRC = 'perfcount_test.c'
+
+bld.SAMBA_SUBSYSTEM('PERFCOUNT',
+                    source='',
+                    deps='''PERFCOUNT_ONEFS PERFCOUNT_TEST''',
+                    vars=locals())
+
+bld.SAMBA_MODULE('PERFCOUNT_ONEFS',
+                 subsystem='PERFCOUNT',
+                 source=PERFCOUNT_ONEFS_SRC,
+                 init_function='',
+                 internal_module=bld.SAMBA3_IS_STATIC_MODULE('PERFCOUNT_ONEFS'),
+                 enabled=bld.SAMBA3_IS_ENABLED_MODULE('PERFCOUNT_ONEFS'))
+
+bld.SAMBA_MODULE('PERFCOUNT_TEST',
+                 subsystem='PERFCOUNT',
+                 source=PERFCOUNT_TEST_SRC,
+                 init_function='',
+                 internal_module=bld.SAMBA3_IS_STATIC_MODULE('PERFCOUNT_TEST'),
+                 enabled=bld.SAMBA3_IS_ENABLED_MODULE('PERFCOUNT_TEST'))
diff --git a/source3/wscript_build b/source3/wscript_build
index e7dd0b733f..6b81247e13 100644
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -518,10 +518,6 @@ NSS_INFO_STATIC = ''
 NSS_INFO_TEMPLATE_SRC = 'winbindd/nss_info_template.c'
 NSS_INFO_SRC = 'winbindd/nss_info.c'
 
-PERFCOUNT_STATIC = ''
-PERFCOUNT_ONEFS_SRC = 'modules/perfcount_onefs.c'
-PERFCOUNT_TEST_SRC = 'modules/perfcount_test.c'
-
 WINBINDD_SRC1 = '''winbindd/winbindd.c
                    winbindd/winbindd_group.c
                    winbindd/winbindd_util.c
@@ -1129,25 +1125,6 @@ bld.SAMBA_SUBSYSTEM('ASN1_UTIL',
                     deps='talloc',
                     local_include=False)
 
-bld.SAMBA_SUBSYSTEM('PERFCOUNT',
-                    source='',
-                    deps='''PERFCOUNT_ONEFS PERFCOUNT_TEST''',
-                    vars=locals())
-
-bld.SAMBA_MODULE('PERFCOUNT_ONEFS',
-                 subsystem='PERFCOUNT',
-                 source=PERFCOUNT_ONEFS_SRC,
-                 init_function='',
-                 internal_module=True,
-                 enabled=False) #fixme
-
-bld.SAMBA_MODULE('PERFCOUNT_TEST',
-                 subsystem='PERFCOUNT',
-                 source=PERFCOUNT_TEST_SRC,
-                 init_function='',
-                 internal_module=True,
-                 enabled=True)
-
 bld.SAMBA_SUBSYSTEM('GPEXT',
                     source=GPEXT_SRC,
                     deps='''GPEXT_REGISTRY GPEXT_SCRIPTS GPEXT_SECURITY''',
-- 
cgit