Revert previous commit

This commit is contained in:
Howard Chu 2003-03-29 00:28:00 +00:00
parent 5a1eb936bc
commit 3499a51dc1
15 changed files with 36 additions and 188 deletions

View File

@ -22,47 +22,55 @@ PROGRAMS = ldapsearch ldapmodify ldapdelete ldapmodrdn \
ldappasswd ldapwhoami ldapcompare
ldapsearch: ldapsearch.o common.o $(XLIBS)
$(LTLINK) -o $@ ldapsearch.o common.o $(LIBS)
ldapsearch: ldsversion.o
$(LTLINK) -o $@ ldapsearch.o common.o ldsversion.o $(LIBS)
ldapmodify: ldapmodify.o common.o $(XLIBS)
$(LTLINK) -o $@ ldapmodify.o common.o $(LIBS)
ldapmodify: ldmversion.o
$(LTLINK) -o $@ ldapmodify.o common.o ldmversion.o $(LIBS)
ldapdelete: ldapdelete.o common.o $(XLIBS)
$(LTLINK) -o $@ ldapdelete.o common.o $(LIBS)
ldapdelete: lddversion.o
$(LTLINK) -o $@ ldapdelete.o common.o lddversion.o $(LIBS)
ldapmodrdn: ldapmodrdn.o common.o $(XLIBS)
$(LTLINK) -o $@ ldapmodrdn.o common.o $(LIBS)
ldapmodrdn: ldrversion.o
$(LTLINK) -o $@ ldapmodrdn.o common.o ldrversion.o $(LIBS)
ldappasswd: ldappasswd.o common.o $(XLIBS)
$(LTLINK) -o $@ ldappasswd.o common.o $(LIBS)
ldappasswd: ldpversion.o
$(LTLINK) -o $@ ldappasswd.o common.o ldpversion.o $(LIBS)
ldapwhoami: ldapwhoami.o common.o $(XLIBS)
$(LTLINK) -o $@ ldapwhoami.o common.o $(LIBS)
ldapwhoami: ldwversion.o
$(LTLINK) -o $@ ldapwhoami.o common.o ldwversion.o $(LIBS)
ldapcompare: ldapcompare.o common.o $(XLIBS)
$(LTLINK) -o $@ ldapcompare.o common.o $(LIBS)
ldapcompare: ldcversion.o
$(LTLINK) -o $@ ldapcompare.o common.o ldcversion.o $(LIBS)
ldapsearch.o: $(srcdir)/ldapsearch.c
$(CC) -c $(CFLAGS) $(CWD_DEF) -o $@ $<
ldsversion.c: ldapsearch.o common.o $(XLIBS)
@-$(RM) $@
$(MKVERSION) $(MKVOPTS) ldapsearch > $@
ldapmodify.o: $(srcdir)/ldapmodify.c
$(CC) -c $(CFLAGS) $(CWD_DEF) -o $@ $<
ldmversion.c: ldapmodify.o common.o $(XLIBS)
@-$(RM) $@
$(MKVERSION) $(MKVOPTS) ldapmodify > $@
ldapdelete.o: $(srcdir)/ldapdelete.c
$(CC) -c $(CFLAGS) $(CWD_DEF) -o $@ $<
lddversion.c: ldapdelete.o common.o $(XLIBS)
@-$(RM) $@
$(MKVERSION) $(MKVOPTS) ldapdelete > $@
ldapmodrdn.o: $(srcdir)/ldapmodrdn.c
$(CC) -c $(CFLAGS) $(CWD_DEF) -o $@ $<
ldpversion.c: ldappasswd.o common.o $(XLIBS)
@-$(RM) $@
$(MKVERSION) $(MKVOPTS) ldappasswd > $@
ldappasswd.o: $(srcdir)/ldappasswd.c
$(CC) -c $(CFLAGS) $(CWD_DEF) -o $@ $<
ldrversion.c: ldapmodrdn.o common.o $(XLIBS)
@-$(RM) $@
$(MKVERSION) $(MKVOPTS) ldapmodrdn > $@
ldapwhoami.o: $(srcdir)/ldapwhoami.c
$(CC) -c $(CFLAGS) $(CWD_DEF) -o $@ $<
ldwversion.c: ldapwhoami.o common.o $(XLIBS)
@-$(RM) $@
$(MKVERSION) $(MKVOPTS) ldapwhoami > $@
ldcversion.c: ldapcompare.o common.o $(XLIBS)
@-$(RM) $@
$(MKVERSION) $(MKVOPTS) ldapcompare > $@
ldapcompare.o: $(srcdir)/ldapcompare.c
$(CC) -c $(CFLAGS) $(CWD_DEF) -o $@ $<
install-local: FORCE
-$(MKDIR) $(DESTDIR)$(bindir)

View File

@ -35,9 +35,6 @@
#include "common.h"
#define _OLV_APP "ldapcompare"
#define _OLV_STATIC
#include "ol_version.h"
static int quiet = 0;

View File

@ -148,25 +148,6 @@ SOURCE=.\common.c
# Begin Source File
SOURCE=.\ldapcompare.c
!IF "$CFG)" == "ldapcompare - Win32 Release"
# ADD CPP /D _OLV_CWD=\"$(OutDir)\"
!ELSEIF "$(CFG)" == "ldapcompare - Win32 Debug"
# ADD CPP /D _OLV_CWD=\"$(OutDir)\"
!ELSEIF "$(CFG)" == "ldapcompare - Win32 Single Debug"
# ADD CPP /D _OLV_CWD=\"$(OutDir)\"
!ELSEIF "$(CFG)" == "ldapcompare - Win32 Single Release"
# ADD CPP /D _OLV_CWD=\"$(OutDir)\"
!ENDIF
# End Source File
# End Target
# End Project

View File

@ -21,10 +21,6 @@
#include "common.h"
#define _OLV_APP "ldapdelete"
#define _OLV_STATIC
#include "ol_version.h"
static int prune = 0;

View File

@ -148,25 +148,6 @@ SOURCE=.\common.c
# Begin Source File
SOURCE=.\ldapdelete.c
!IF "$CFG)" == "ldapdelete - Win32 Release"
# ADD CPP /D _OLV_CWD=\"$(OutDir)\"
!ELSEIF "$(CFG)" == "ldapdelete - Win32 Debug"
# ADD CPP /D _OLV_CWD=\"$(OutDir)\"
!ELSEIF "$(CFG)" == "ldapdelete - Win32 Single Debug"
# ADD CPP /D _OLV_CWD=\"$(OutDir)\"
!ELSEIF "$(CFG)" == "ldapdelete - Win32 Single Release"
# ADD CPP /D _OLV_CWD=\"$(OutDir)\"
!ENDIF
# End Source File
# End Target
# End Project

View File

@ -36,10 +36,6 @@
#include "common.h"
#define _OLV_APP "ldapmodify"
#define _OLV_STATIC
#include "ol_version.h"
static int ldapadd, force = 0;
static char *rejfile = NULL;

View File

@ -148,25 +148,6 @@ SOURCE=.\common.c
# Begin Source File
SOURCE=.\ldapmodify.c
!IF "$CFG)" == "ldapmodify - Win32 Release"
# ADD CPP /D _OLV_CWD=\"$(OutDir)\"
!ELSEIF "$(CFG)" == "ldapmodify - Win32 Debug"
# ADD CPP /D _OLV_CWD=\"$(OutDir)\"
!ELSEIF "$(CFG)" == "ldapmodify - Win32 Single Debug"
# ADD CPP /D _OLV_CWD=\"$(OutDir)\"
!ELSEIF "$(CFG)" == "ldapmodify - Win32 Single Release"
# ADD CPP /D _OLV_CWD=\"$(OutDir)\"
!ENDIF
# End Source File
# End Target
# End Project

View File

@ -34,10 +34,6 @@
#include "common.h"
#define _OLV_APP "ldapmodrdn"
#define _OLV_STATIC
#include "ol_version.h"
static char *newSuperior = NULL;
static int remove_old_RDN = 0;

View File

@ -148,25 +148,6 @@ SOURCE=.\common.c
# Begin Source File
SOURCE=.\ldapmodrdn.c
!IF "$CFG)" == "ldapmodrdn - Win32 Release"
# ADD CPP /D _OLV_CWD=\"$(OutDir)\"
!ELSEIF "$(CFG)" == "ldapmodrdn - Win32 Debug"
# ADD CPP /D _OLV_CWD=\"$(OutDir)\"
!ELSEIF "$(CFG)" == "ldapmodrdn - Win32 Single Debug"
# ADD CPP /D _OLV_CWD=\"$(OutDir)\"
!ELSEIF "$(CFG)" == "ldapmodrdn - Win32 Single Release"
# ADD CPP /D _OLV_CWD=\"$(OutDir)\"
!ENDIF
# End Source File
# End Target
# End Project

View File

@ -23,10 +23,6 @@
#include "common.h"
#define _OLV_APP "ldappasswd"
#define _OLV_STATIC
#include "ol_version.h"
static char *newpw = NULL;
static char *oldpw = NULL;

View File

@ -144,25 +144,6 @@ SOURCE=.\common.c
# Begin Source File
SOURCE=.\ldappasswd.c
!IF "$CFG)" == "ldappasswd - Win32 Release"
# ADD CPP /D _OLV_CWD=\"$(OutDir)\"
!ELSEIF "$(CFG)" == "ldappasswd - Win32 Debug"
# ADD CPP /D _OLV_CWD=\"$(OutDir)\"
!ELSEIF "$(CFG)" == "ldappasswd - Win32 Single Debug"
# ADD CPP /D _OLV_CWD=\"$(OutDir)\"
!ELSEIF "$(CFG)" == "ldappasswd - Win32 Single Release"
# ADD CPP /D _OLV_CWD=\"$(OutDir)\"
!ENDIF
# End Source File
# End Target
# End Project

View File

@ -36,10 +36,6 @@
#include "common.h"
#define _OLV_APP "ldapsearch"
#define _OLV_STATIC
#include "ol_version.h"
static int scope = LDAP_SCOPE_SUBTREE;
static int deref = -1;

View File

@ -148,25 +148,6 @@ SOURCE=.\common.c
# Begin Source File
SOURCE=.\ldapsearch.c
!IF "$CFG)" == "ldapsearch - Win32 Release"
# ADD CPP /D _OLV_CWD=\"$(OutDir)\"
!ELSEIF "$(CFG)" == "ldapsearch - Win32 Debug"
# ADD CPP /D _OLV_CWD=\"$(OutDir)\"
!ELSEIF "$(CFG)" == "ldapsearch - Win32 Single Debug"
# ADD CPP /D _OLV_CWD=\"$(OutDir)\"
!ELSEIF "$(CFG)" == "ldapsearch - Win32 Single Release"
# ADD CPP /D _OLV_CWD=\"$(OutDir)\"
!ENDIF
# End Source File
# End Target
# End Project

View File

@ -23,10 +23,6 @@
#include "common.h"
#define _OLV_APP "ldapwhoami"
#define _OLV_STATIC
#include "ol_version.h"
void
usage( void )

View File

@ -144,25 +144,6 @@ SOURCE=.\common.c
# Begin Source File
SOURCE=.\ldapwhoami.c
!IF "$CFG)" == "ldapwhoami - Win32 Release"
# ADD CPP /D _OLV_CWD=\"$(OutDir)\"
!ELSEIF "$(CFG)" == "ldapwhoami - Win32 Debug"
# ADD CPP /D _OLV_CWD=\"$(OutDir)\"
!ELSEIF "$(CFG)" == "ldapwhoami - Win32 Single Debug"
# ADD CPP /D _OLV_CWD=\"$(OutDir)\"
!ELSEIF "$(CFG)" == "ldapwhoami - Win32 Single Release"
# ADD CPP /D _OLV_CWD=\"$(OutDir)\"
!ENDIF
# End Source File
# End Target
# End Project