diff options
| author | Noriko Hosoi <nhosoi@redhat.com> | 2006-11-10 01:50:11 +0000 |
|---|---|---|
| committer | Noriko Hosoi <nhosoi@redhat.com> | 2006-11-10 01:50:11 +0000 |
| commit | 1fdd67bc7b70af01cd7d2e6b67216b5c5bb24527 (patch) | |
| tree | e37f2304d463ad8b86e26f88d3933ad1da927958 | |
| parent | 8146fa551eb295aa873ba2bb721f6c2908092184 (diff) | |
| download | ds-1fdd67bc7b70af01cd7d2e6b67216b5c5bb24527.tar.gz ds-1fdd67bc7b70af01cd7d2e6b67216b5c5bb24527.tar.xz ds-1fdd67bc7b70af01cd7d2e6b67216b5c5bb24527.zip | |
Resolves: #214728
Summary: Cleaning up obsolete macros in the build
Changes: eliminated macros(Comment #24)
NS_DS, NET_SSL, DUPGRADEDB, NSPR20, LDAPDB_THREAD_SAFE, CLIENT_AUTH,
MCC_HTTPD, NS_DOMESTIC, SPAPI20, SERVER_BUILD
| -rw-r--r-- | Makefile.am | 5 | ||||
| -rw-r--r-- | Makefile.in | 8 |
2 files changed, 3 insertions, 10 deletions
diff --git a/Makefile.am b/Makefile.am index 6f86b79a..25bad419 100644 --- a/Makefile.am +++ b/Makefile.am @@ -7,10 +7,7 @@ ACLOCAL_AMFLAGS = -I m4 BUILDNUM := $(shell perl $(srcdir)/buildnum.pl) PLATFORM_DEFINES = @platform_defs@ DEBUG_DEFINES = @debug_defs@ -DS_DEFINES = -DNS_DS -DNET_SSL -DLDAP_DEBUG -DLDAP_DONT_USE_SMARTHEAP \ - -DUPGRADEDB -DNSPR20 -DLDAPDB_THREAD_SAFE -DCLIENT_AUTH \ - -DMCC_HTTPD -DNS_DOMESTIC -DSPAPI20 -DSERVER_BUILD \ - -DBUILD_NUM=$(BUILDNUM) +DS_DEFINES = -DLDAP_DEBUG -DLDAP_DONT_USE_SMARTHEAP -DBUILD_NUM=$(BUILDNUM) DS_INCLUDES = -I$(srcdir)/ldap/include -I$(srcdir)/ldap/servers/slapd -I$(srcdir)/include -I. AM_CPPFLAGS = $(PLATFORM_DEFINES) $(DEBUG_DEFINES) $(DS_DEFINES) $(DS_INCLUDES) PLUGIN_CPPFLAGS = $(AM_CPPFLAGS) @ldapsdk_inc@ @nss_inc@ @nspr_inc@ diff --git a/Makefile.in b/Makefile.in index 5a5c0c11..b7913470 100644 --- a/Makefile.in +++ b/Makefile.in @@ -911,11 +911,7 @@ ACLOCAL_AMFLAGS = -I m4 BUILDNUM := $(shell perl $(srcdir)/buildnum.pl) PLATFORM_DEFINES = @platform_defs@ DEBUG_DEFINES = @debug_defs@ -DS_DEFINES = -DNS_DS -DNET_SSL -DLDAP_DEBUG -DLDAP_DONT_USE_SMARTHEAP \ - -DUPGRADEDB -DNSPR20 -DLDAPDB_THREAD_SAFE -DCLIENT_AUTH \ - -DMCC_HTTPD -DNS_DOMESTIC -DSPAPI20 -DSERVER_BUILD \ - -DBUILD_NUM=$(BUILDNUM) - +DS_DEFINES = -DLDAP_DEBUG -DLDAP_DONT_USE_SMARTHEAP -DBUILD_NUM=$(BUILDNUM) DS_INCLUDES = -I$(srcdir)/ldap/include -I$(srcdir)/ldap/servers/slapd -I$(srcdir)/include -I. AM_CPPFLAGS = $(PLATFORM_DEFINES) $(DEBUG_DEFINES) $(DS_DEFINES) $(DS_INCLUDES) PLUGIN_CPPFLAGS = $(AM_CPPFLAGS) @ldapsdk_inc@ @nss_inc@ @nspr_inc@ @@ -8964,7 +8960,7 @@ ns-slapd.properties: makstrdb ./makstrdb %: %.in - mkdir -p $(dir $@) + mkdir -p $(dir $@) $(fixupcmd) $^ > $@ # 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. |