diff options
Diffstat (limited to 'Makefile.in')
| -rw-r--r-- | Makefile.in | 38 |
1 files changed, 7 insertions, 31 deletions
diff --git a/Makefile.in b/Makefile.in index 84a6b8ce..215b72d5 100644 --- a/Makefile.in +++ b/Makefile.in @@ -726,8 +726,8 @@ am__ns_slapd_SOURCES_DIST = ldap/servers/slapd/abandon.c \ ldap/servers/slapd/fedse.c ldap/servers/slapd/fileio.c \ ldap/servers/slapd/getopt_ext.c ldap/servers/slapd/globals.c \ ldap/servers/slapd/house.c ldap/servers/slapd/init.c \ - ldap/servers/slapd/lite_entries.c ldap/servers/slapd/main.c \ - ldap/servers/slapd/monitor.c ldap/servers/slapd/passwd_extop.c \ + ldap/servers/slapd/main.c ldap/servers/slapd/monitor.c \ + ldap/servers/slapd/passwd_extop.c \ ldap/servers/slapd/protect_db.c ldap/servers/slapd/psearch.c \ ldap/servers/slapd/pw_mgmt.c ldap/servers/slapd/rootdse.c \ ldap/servers/slapd/sasl_io.c ldap/servers/slapd/saslbind.c \ @@ -754,7 +754,6 @@ am_ns_slapd_OBJECTS = ldap/servers/slapd/ns_slapd-abandon.$(OBJEXT) \ ldap/servers/slapd/ns_slapd-globals.$(OBJEXT) \ ldap/servers/slapd/ns_slapd-house.$(OBJEXT) \ ldap/servers/slapd/ns_slapd-init.$(OBJEXT) \ - ldap/servers/slapd/ns_slapd-lite_entries.$(OBJEXT) \ ldap/servers/slapd/ns_slapd-main.$(OBJEXT) \ ldap/servers/slapd/ns_slapd-monitor.$(OBJEXT) \ ldap/servers/slapd/ns_slapd-passwd_extop.$(OBJEXT) \ @@ -1119,7 +1118,7 @@ QUOTE := $(NULLSTRING)"# a double quote" BUILDNUM := $(shell perl $(srcdir)/buildnum.pl) NQBUILDNUM := $(subst \,,$(subst $(QUOTE),,$(BUILDNUM))) DEBUG_DEFINES = @debug_defs@ -DS_DEFINES = -DBUILD_NUM=$(BUILDNUM) +DS_DEFINES = -DBUILD_NUM=$(BUILDNUM) -DVENDOR="\"$(vendor)\"" -DBRAND="\"$(brand)\"" -DCAPBRAND="\"$(capbrand)\"" DS_INCLUDES = -I$(srcdir)/ldap/include -I$(srcdir)/ldap/servers/slapd -I$(srcdir)/include -I. # these paths are dependent on the settings of prefix and exec_prefix which may be specified # at make time. So we cannot use AC_DEFINE in the configure.ac because that would set the @@ -1160,8 +1159,8 @@ KERBEROS_LINK = $(kerberos_lib) #------------------------ # Generated Sources #------------------------ -BUILT_SOURCES = dirver.h dberrstrs.h -CLEANFILES = dirver.h dberrstrs.h ns-slapd.properties \ +BUILT_SOURCES = dberrstrs.h +CLEANFILES = dberrstrs.h ns-slapd.properties \ ldap/admin/src/scripts/dscreate.map ldap/admin/src/scripts/remove-ds.pl \ ldap/admin/src/scripts/DSCreate.pm ldap/admin/src/scripts/DSMigration.pm \ ldap/admin/src/scripts/dsorgentries.map ldap/admin/src/scripts/migrate-ds.pl \ @@ -2085,7 +2084,6 @@ ns_slapd_SOURCES = ldap/servers/slapd/abandon.c \ ldap/servers/slapd/globals.c \ ldap/servers/slapd/house.c \ ldap/servers/slapd/init.c \ - ldap/servers/slapd/lite_entries.c \ ldap/servers/slapd/main.c \ ldap/servers/slapd/monitor.c \ ldap/servers/slapd/passwd_extop.c \ @@ -2186,9 +2184,9 @@ rsearch_bin_LDADD = $(NSPR_LINK) $(NSS_LINK) $(LDAPSDK_LINK) $(SASL_LINK) $(LIBS # these are for the config files and scripts that we need to generate and replace # the paths and other tokens with the real values set during configure/make # note that we cannot just use AC_OUTPUT to do this for us, since it will do things like this: -# LD_LIBRARY_PATH = ${prefix}/lib/fedora-ds +# LD_LIBRARY_PATH = ${prefix}/lib/dirsrv # i.e. it literally copies in '${prefix}' rather than expanding it out - we want this instead: -# LD_LIBRARY_PATH = /usr/lib/fedora-ds +# LD_LIBRARY_PATH = /usr/lib/dirsrv # on the systems on which we bundle, perldap will be in libdir/perl, so we need to point # the perlpath there - on other systems, perldap will be installed as a site module into # the system perl @@ -4008,9 +4006,6 @@ ldap/servers/slapd/ns_slapd-house.$(OBJEXT): \ ldap/servers/slapd/ns_slapd-init.$(OBJEXT): \ ldap/servers/slapd/$(am__dirstamp) \ ldap/servers/slapd/$(DEPDIR)/$(am__dirstamp) -ldap/servers/slapd/ns_slapd-lite_entries.$(OBJEXT): \ - ldap/servers/slapd/$(am__dirstamp) \ - ldap/servers/slapd/$(DEPDIR)/$(am__dirstamp) ldap/servers/slapd/ns_slapd-main.$(OBJEXT): \ ldap/servers/slapd/$(am__dirstamp) \ ldap/servers/slapd/$(DEPDIR)/$(am__dirstamp) @@ -4818,7 +4813,6 @@ mostlyclean-compile: -rm -f ldap/servers/slapd/ns_slapd-globals.$(OBJEXT) -rm -f ldap/servers/slapd/ns_slapd-house.$(OBJEXT) -rm -f ldap/servers/slapd/ns_slapd-init.$(OBJEXT) - -rm -f ldap/servers/slapd/ns_slapd-lite_entries.$(OBJEXT) -rm -f ldap/servers/slapd/ns_slapd-main.$(OBJEXT) -rm -f ldap/servers/slapd/ns_slapd-monitor.$(OBJEXT) -rm -f ldap/servers/slapd/ns_slapd-passwd_extop.$(OBJEXT) @@ -5270,7 +5264,6 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@ldap/servers/slapd/$(DEPDIR)/ns_slapd-globals.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@ldap/servers/slapd/$(DEPDIR)/ns_slapd-house.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@ldap/servers/slapd/$(DEPDIR)/ns_slapd-init.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@ldap/servers/slapd/$(DEPDIR)/ns_slapd-lite_entries.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@ldap/servers/slapd/$(DEPDIR)/ns_slapd-main.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@ldap/servers/slapd/$(DEPDIR)/ns_slapd-monitor.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@ldap/servers/slapd/$(DEPDIR)/ns_slapd-passwd_extop.Po@am__quote@ @@ -8513,20 +8506,6 @@ ldap/servers/slapd/ns_slapd-init.obj: ldap/servers/slapd/init.c @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ns_slapd_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ldap/servers/slapd/ns_slapd-init.obj `if test -f 'ldap/servers/slapd/init.c'; then $(CYGPATH_W) 'ldap/servers/slapd/init.c'; else $(CYGPATH_W) '$(srcdir)/ldap/servers/slapd/init.c'; fi` -ldap/servers/slapd/ns_slapd-lite_entries.o: ldap/servers/slapd/lite_entries.c -@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ns_slapd_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ldap/servers/slapd/ns_slapd-lite_entries.o -MD -MP -MF "ldap/servers/slapd/$(DEPDIR)/ns_slapd-lite_entries.Tpo" -c -o ldap/servers/slapd/ns_slapd-lite_entries.o `test -f 'ldap/servers/slapd/lite_entries.c' || echo '$(srcdir)/'`ldap/servers/slapd/lite_entries.c; \ -@am__fastdepCC_TRUE@ then mv -f "ldap/servers/slapd/$(DEPDIR)/ns_slapd-lite_entries.Tpo" "ldap/servers/slapd/$(DEPDIR)/ns_slapd-lite_entries.Po"; else rm -f "ldap/servers/slapd/$(DEPDIR)/ns_slapd-lite_entries.Tpo"; exit 1; fi -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='ldap/servers/slapd/lite_entries.c' object='ldap/servers/slapd/ns_slapd-lite_entries.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ns_slapd_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ldap/servers/slapd/ns_slapd-lite_entries.o `test -f 'ldap/servers/slapd/lite_entries.c' || echo '$(srcdir)/'`ldap/servers/slapd/lite_entries.c - -ldap/servers/slapd/ns_slapd-lite_entries.obj: ldap/servers/slapd/lite_entries.c -@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ns_slapd_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ldap/servers/slapd/ns_slapd-lite_entries.obj -MD -MP -MF "ldap/servers/slapd/$(DEPDIR)/ns_slapd-lite_entries.Tpo" -c -o ldap/servers/slapd/ns_slapd-lite_entries.obj `if test -f 'ldap/servers/slapd/lite_entries.c'; then $(CYGPATH_W) 'ldap/servers/slapd/lite_entries.c'; else $(CYGPATH_W) '$(srcdir)/ldap/servers/slapd/lite_entries.c'; fi`; \ -@am__fastdepCC_TRUE@ then mv -f "ldap/servers/slapd/$(DEPDIR)/ns_slapd-lite_entries.Tpo" "ldap/servers/slapd/$(DEPDIR)/ns_slapd-lite_entries.Po"; else rm -f "ldap/servers/slapd/$(DEPDIR)/ns_slapd-lite_entries.Tpo"; exit 1; fi -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='ldap/servers/slapd/lite_entries.c' object='ldap/servers/slapd/ns_slapd-lite_entries.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ns_slapd_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ldap/servers/slapd/ns_slapd-lite_entries.obj `if test -f 'ldap/servers/slapd/lite_entries.c'; then $(CYGPATH_W) 'ldap/servers/slapd/lite_entries.c'; else $(CYGPATH_W) '$(srcdir)/ldap/servers/slapd/lite_entries.c'; fi` - ldap/servers/slapd/ns_slapd-main.o: ldap/servers/slapd/main.c @am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ns_slapd_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ldap/servers/slapd/ns_slapd-main.o -MD -MP -MF "ldap/servers/slapd/$(DEPDIR)/ns_slapd-main.Tpo" -c -o ldap/servers/slapd/ns_slapd-main.o `test -f 'ldap/servers/slapd/main.c' || echo '$(srcdir)/'`ldap/servers/slapd/main.c; \ @am__fastdepCC_TRUE@ then mv -f "ldap/servers/slapd/$(DEPDIR)/ns_slapd-main.Tpo" "ldap/servers/slapd/$(DEPDIR)/ns_slapd-main.Po"; else rm -f "ldap/servers/slapd/$(DEPDIR)/ns_slapd-main.Tpo"; exit 1; fi @@ -9802,9 +9781,6 @@ uninstall-man: uninstall-man1 uninstall-man8 uninstall-serverpluginLTLIBRARIES uninstall-taskSCRIPTS -dirver.h: Makefile - perl $(srcdir)/dirver.pl -v "$(VERSION)" -o dirver.h - dberrstrs.h: Makefile perl $(srcdir)/ldap/servers/slapd/mkDBErrStrs.pl -i @db_incdir@ -o . |