diff options
Diffstat (limited to 'ldap/admin')
| -rw-r--r-- | ldap/admin/lib/Makefile | 12 | ||||
| -rw-r--r-- | ldap/admin/src/Makefile | 12 |
2 files changed, 1 insertions, 23 deletions
diff --git a/ldap/admin/lib/Makefile b/ldap/admin/lib/Makefile index 3eebe24d..b130a224 100644 --- a/ldap/admin/lib/Makefile +++ b/ldap/admin/lib/Makefile @@ -64,9 +64,6 @@ SRCS = dsalib_location.c dsalib_debug.c dsalib_updown.c dsalib_tailf.c \ OBJS = $(addprefix $(OBJDEST)/, $(subst .c,.o,$(SRCS))) INCLUDES += -I$(LDAP_SRC)/admin/include -ifdef FORTEZZA -INCLUDES += -I$(BUILD_ROOT)/lib -endif EXTRA_LIBS += $(LDAP_COMMON_LIBS) $(SECURITYLINK) $(NSPRLINK) @@ -77,15 +74,6 @@ MAPFILE= /MAP:$(LDAP_ADMLIBDIR)/libds_admin.map EXTRA_LIBS_DEP += $(LDAP_COMMON_LIBS_DEP) $(LDAP_LIBLDIF_DEP) #EXTRA_LIBS += $(LDAP_COMMON_LIBS) $(LDAP_LIBLDIF) $(LDAP_SDK_LIBLDAP_DLL) \ # $(ADMINUTIL_LINK) $(SECURITYLINK) $(NSPRLINK) -else # WINNT -ifdef FORTEZZA -# libci.a needs to be recompiled with the -Z option on HPUX, until then, -# we'll link libci.a with the executables which need it -atom -ifneq ($(ARCH), HPUX) -EXTRA_LIBS_DEP += $(FORTEZZA_DRIVER) -EXTRA_LIBS += $(FORTEZZA_DRIVER) -endif # !HPUX -endif # FORTEZZA endif # WINNT ifeq ($(ARCH), Linux) diff --git a/ldap/admin/src/Makefile b/ldap/admin/src/Makefile index af5cb826..5210982c 100644 --- a/ldap/admin/src/Makefile +++ b/ldap/admin/src/Makefile @@ -132,12 +132,6 @@ EXTRA_LIBS += -lsocket -lnsl -lgen -lm -lposix4 -lthread OPENSOURCE_LIBS += -lsocket -lnsl -lgen -lm -lposix4 -lthread else ifeq ($(ARCH),HPUX) -ifdef FORTEZZA -# link with libci.a for FORTEZZA builds. On other platforms, libci.a is -# linked into libds_admin.so, but not on HPUX -EXTRA_LIBS_DEP += $(FORTEZZA_DRIVER) -EXTRA_LIBS += $(FORTEZZA_DRIVER) -endif ifeq ($(USE_64), 1) EXTRALDFLAGS += +DA2.0W +DS2.0 +Z endif @@ -349,11 +343,7 @@ $(LDAP_SERVER_RELDIR)/namegen.exe: $(OBJDEST)/namegen.o $(LDAP_SERVER_RELDIR)/latest_file.exe: $(OBJDEST)/latest_file.o $(LINK_EXE_NOLIBSOBJS) $^ -installPerlFiles: $(BINDIR) $(BINDIR)/Install.pl - -$(BINDIR)/Install.pl: CreateInstall.pl $(PERL_SCRIPTS_DEST) - -@$(RM) $@ - $(CP) $< $@ +installPerlFiles: $(BINDIR) $(PERL_SCRIPTS_DEST) $(BINDIR)/%: % -@$(RM) $@ |