Skip to content

Commit 57f1140

Browse files
committed
Changes in makefiles to support LDAP plugin compilation
1 parent aa38dd2 commit 57f1140

11 files changed

+24
-35
lines changed

Makefile.Linux

+2
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@ DLFLAGS = -shared
1919
DLSUFFICS = .ld.so
2020
# -lpthreads may be reuqired on some platforms instead of -pthreads
2121
LIBS = -lcrypto -lssl -ldl
22+
LIBSPREFIX = -l
23+
LIBSSUFFIX =
2224
LNOUT = -o
2325
EXESUFFICS =
2426
OBJSUFFICS = .o

Makefile.Solaris

+2
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@ DCFLAGS = -fpic
1717
DLFLAGS = -shared
1818
DLSUFFICS = .ld.so
1919
LIBS = -lpthread -lsocket -lnsl -lresolv -ldl
20+
LIBSPREFIX = -l
21+
LIBSSUFFIX =
2022
LNOUT = -o ./
2123
EXESUFFICS =
2224
OBJSUFFICS = .o

Makefile.Solaris-gcc

+2
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@ DCFLAGS = -fpic
1818
DLFLAGS = -shared
1919
DLSUFFICS = .ld.so
2020
LIBS = -lpthread -lsocket -lnsl -lresolv -ldl
21+
LIBSPREFIX = -l
22+
LIBSSUFFIX =
2123
LNOUT = -o ./
2224
EXESUFFICS =
2325
OBJSUFFICS = .o

Makefile.ccc

-34
This file was deleted.

Makefile.llvm

+2
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@ LDFLAGS = -O2 -static -s
1717
DLFLAGS = -shared
1818
DLSUFFICS = .dll
1919
LIBS = -lws2_32 -lodbc32 -ladvapi32
20+
LIBSPREFIX = -l
21+
LIBSSUFFIX =
2022
LNOUT = -o
2123
EXESUFFICS = .exe
2224
OBJSUFFICS = .o

Makefile.msvc

+2
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@ DLFLAGS = /DLL
1616
DLSUFFICS = .dll
1717
LIBS = ws2_32.lib advapi32.lib odbc32.lib user32.lib kernel32.lib Gdi32.lib libeay32MT.lib ssleay32MT.lib
1818
LIBSOLD = libeay32MT.lib ssleay32MT.lib
19+
LIBSPREFIX =
20+
LIBSSUFFIX = .lib
1921
LIBEXT = .lib
2022
LNOUT = /out:
2123
EXESUFFICS = .exe

Makefile.msvc64

+2
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@ DLFLAGS = /DLL
1616
DLSUFFICS = .dll
1717
LIBS = ws2_32.lib advapi32.lib odbc32.lib user32.lib kernel32.lib Gdi32.lib libeay32MT.lib ssleay32MT.lib
1818
LIBSOLD = libeay32MT.lib ssleay32MT.lib
19+
LIBSPREFIX =
20+
LIBSSUFFIX = .lib
1921
LIBEXT = .lib
2022
LNOUT = /out:
2123
EXESUFFICS = .exe

Makefile.unix

+2
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,8 @@ DCFLAGS = -fpic
2121
DLFLAGS = -shared
2222
DLSUFFICS = .ld.so
2323
LIBS =
24+
LIBSPREFIX = -l
25+
LIBSSUFFIX =
2426
LNOUT = -o
2527
EXESUFFICS =
2628
OBJSUFFICS = .o

Makefile.win

+2
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@ LDFLAGS = -O2 -s -mthreads
1717
DLFLAGS = -shared
1818
DLSUFFICS = .dll
1919
LIBS = -lws2_32 -lodbc32 -ladvapi32
20+
LIBSPREFIX = -l
21+
LIBSSUFFIX =
2022
LNOUT = -o
2123
EXESUFFICS = .exe
2224
OBJSUFFICS = .o

src/plugins/LdapPlugin/Makefile.inc

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
all: $(BUILDDIR)ldapauth$(DLSUFFICS)
2+
3+
ldapauth$(OBJSUFFICS): ldapauth.c
4+
$(CC) $(DCFLAGS) $(CFLAGS) ldapauth.c
5+
6+
$(BUILDDIR)ldapauth$(DLSUFFICS): ldapauth$(OBJSUFFICS)
7+
$(LN) $(LNOUT)../../$(BUILDDIR)ldapauth$(DLSUFFICS) $(LDFLAGS) $(DLFLAGS) $(LIBSPREFIX)ladp$(LIBSSUFFIX) ldapauth$(OBJSUFFICS)

src/plugins/PamAuth/Makefile.inc

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,4 @@ pamauth$(OBJSUFFICS): pamauth.c
44
$(CC) $(DCFLAGS) $(CFLAGS) pamauth.c
55

66
$(BUILDDIR)pamauth$(DLSUFFICS): pamauth$(OBJSUFFICS)
7-
$(LN) $(LNOUT)../../$(BUILDDIR)pamauth$(DLSUFFICS) $(LDFLAGS) $(DLFLAGS) -lpam pamauth$(OBJSUFFICS)
7+
$(LN) $(LNOUT)../../$(BUILDDIR)pamauth$(DLSUFFICS) $(LDFLAGS) $(DLFLAGS) $(LIBSPREFIX)pam$(LIBSSUFFIX) pamauth$(OBJSUFFICS)

0 commit comments

Comments
 (0)