From 57f11407346282c8976466e18143528c329b8a9f Mon Sep 17 00:00:00 2001
From: z3APA3A <3APA3A@3proxy.ru>
Date: Mon, 22 Feb 2016 21:46:32 +0300
Subject: [PATCH] Changes in makefiles to support LDAP plugin compilation

---
 Makefile.Linux                      |  2 ++
 Makefile.Solaris                    |  2 ++
 Makefile.Solaris-gcc                |  2 ++
 Makefile.ccc                        | 34 -----------------------------
 Makefile.llvm                       |  2 ++
 Makefile.msvc                       |  2 ++
 Makefile.msvc64                     |  2 ++
 Makefile.unix                       |  2 ++
 Makefile.win                        |  2 ++
 src/plugins/LdapPlugin/Makefile.inc |  7 ++++++
 src/plugins/PamAuth/Makefile.inc    |  2 +-
 11 files changed, 24 insertions(+), 35 deletions(-)
 delete mode 100644 Makefile.ccc
 create mode 100644 src/plugins/LdapPlugin/Makefile.inc

diff --git a/Makefile.Linux b/Makefile.Linux
index 2ed13ad..e9ba03a 100644
--- a/Makefile.Linux
+++ b/Makefile.Linux
@@ -19,6 +19,8 @@ DLFLAGS = -shared
 DLSUFFICS = .ld.so
 # -lpthreads may be reuqired on some platforms instead of -pthreads
 LIBS = -lcrypto -lssl -ldl 
+LIBSPREFIX = -l
+LIBSSUFFIX = 
 LNOUT = -o 
 EXESUFFICS =
 OBJSUFFICS = .o
diff --git a/Makefile.Solaris b/Makefile.Solaris
index 31644a7..290993c 100644
--- a/Makefile.Solaris
+++ b/Makefile.Solaris
@@ -17,6 +17,8 @@ DCFLAGS = -fpic
 DLFLAGS = -shared
 DLSUFFICS = .ld.so
 LIBS = -lpthread -lsocket -lnsl -lresolv -ldl
+LIBSPREFIX = -l
+LIBSSUFFIX = 
 LNOUT = -o ./
 EXESUFFICS =
 OBJSUFFICS = .o
diff --git a/Makefile.Solaris-gcc b/Makefile.Solaris-gcc
index 393d3ce..fa9a4cf 100644
--- a/Makefile.Solaris-gcc
+++ b/Makefile.Solaris-gcc
@@ -18,6 +18,8 @@ DCFLAGS = -fpic
 DLFLAGS = -shared
 DLSUFFICS = .ld.so
 LIBS = -lpthread -lsocket -lnsl -lresolv -ldl
+LIBSPREFIX = -l
+LIBSSUFFIX = 
 LNOUT = -o ./
 EXESUFFICS =
 OBJSUFFICS = .o
diff --git a/Makefile.ccc b/Makefile.ccc
deleted file mode 100644
index f97a1e2..0000000
--- a/Makefile.ccc
+++ /dev/null
@@ -1,34 +0,0 @@
-#
-# 3 proxy Makefile for Compaq C Compiler
-#
-# You can try to remove -DWITH_STD_MALLOC to CFLAGS to use optimized malloc
-# libraries
-#
-# remove -DNOODBC from CFLAGS and add -lodbc to LDFLAGS to compile with ODBC
-# library support. Add -DSAFESQL for poorely written ODBC library / drivers.
-
-BUILDDIR =
-CC = ccc
-CFLAGS = -O2 -c -pthread -D_THREAD_SAFE -DNOODBC -DWITH_STD_MALLOC -DFD_SETSIZE=4096 -WITH_POLL
-COUT = -o 
-LN = ccc
-LDFLAGS = -O2 -pthread
-DCFLAGS = -fpic
-DLFLAGS = -shared
-DLSUFFICS = .ld.so
-LIBS =
-LNOUT = -o 
-EXESUFFICS =
-OBJSUFFICS = .o
-DEFINEOPTION = -D
-COMPFILES = *~
-REMOVECOMMAND = rm -f
-TYPECOMMAND = cat
-COMPATLIBS =
-MAKEFILE = Makefile.ccc
-PLUGINS = StringsPlugin TrafficPlugin PCREPlugin
-
-include Makefile.inc
-
-allplugins:
-	@list='$(PLUGINS)'; for p in $$list; do cp Makefile Makefile.var plugins/$$p; cd plugins/$$p ; make ;	cd ../.. ; done
diff --git a/Makefile.llvm b/Makefile.llvm
index 557a6a8..6d3dcc8 100644
--- a/Makefile.llvm
+++ b/Makefile.llvm
@@ -17,6 +17,8 @@ LDFLAGS = -O2 -static -s
 DLFLAGS = -shared
 DLSUFFICS = .dll
 LIBS = -lws2_32 -lodbc32 -ladvapi32
+LIBSPREFIX = -l
+LIBSSUFFIX = 
 LNOUT = -o 
 EXESUFFICS = .exe
 OBJSUFFICS = .o
diff --git a/Makefile.msvc b/Makefile.msvc
index 14e4c23..9a489bf 100644
--- a/Makefile.msvc
+++ b/Makefile.msvc
@@ -16,6 +16,8 @@ DLFLAGS = /DLL
 DLSUFFICS = .dll
 LIBS = ws2_32.lib advapi32.lib odbc32.lib user32.lib kernel32.lib Gdi32.lib libeay32MT.lib ssleay32MT.lib
 LIBSOLD = libeay32MT.lib ssleay32MT.lib
+LIBSPREFIX = 
+LIBSSUFFIX = .lib
 LIBEXT = .lib                                                                                               
 LNOUT = /out:
 EXESUFFICS = .exe
diff --git a/Makefile.msvc64 b/Makefile.msvc64
index 1e08362..c0174da 100644
--- a/Makefile.msvc64
+++ b/Makefile.msvc64
@@ -16,6 +16,8 @@ DLFLAGS = /DLL
 DLSUFFICS = .dll
 LIBS = ws2_32.lib advapi32.lib odbc32.lib user32.lib kernel32.lib Gdi32.lib libeay32MT.lib ssleay32MT.lib
 LIBSOLD = libeay32MT.lib ssleay32MT.lib
+LIBSPREFIX = 
+LIBSSUFFIX = .lib
 LIBEXT = .lib
 LNOUT = /out:
 EXESUFFICS = .exe
diff --git a/Makefile.unix b/Makefile.unix
index 60a7aeb..b0a6581 100644
--- a/Makefile.unix
+++ b/Makefile.unix
@@ -21,6 +21,8 @@ DCFLAGS = -fpic
 DLFLAGS = -shared
 DLSUFFICS = .ld.so
 LIBS =
+LIBSPREFIX = -l
+LIBSSUFFIX = 
 LNOUT = -o 
 EXESUFFICS =
 OBJSUFFICS = .o
diff --git a/Makefile.win b/Makefile.win
index 55b0f0c..19f6952 100644
--- a/Makefile.win
+++ b/Makefile.win
@@ -17,6 +17,8 @@ LDFLAGS = -O2 -s -mthreads
 DLFLAGS = -shared
 DLSUFFICS = .dll
 LIBS = -lws2_32 -lodbc32 -ladvapi32
+LIBSPREFIX = -l
+LIBSSUFFIX = 
 LNOUT = -o 
 EXESUFFICS = .exe
 OBJSUFFICS = .o
diff --git a/src/plugins/LdapPlugin/Makefile.inc b/src/plugins/LdapPlugin/Makefile.inc
new file mode 100644
index 0000000..b21cf15
--- /dev/null
+++ b/src/plugins/LdapPlugin/Makefile.inc
@@ -0,0 +1,7 @@
+all: $(BUILDDIR)ldapauth$(DLSUFFICS)
+
+ldapauth$(OBJSUFFICS): ldapauth.c
+	$(CC) $(DCFLAGS) $(CFLAGS) ldapauth.c
+
+$(BUILDDIR)ldapauth$(DLSUFFICS): ldapauth$(OBJSUFFICS)
+	$(LN) $(LNOUT)../../$(BUILDDIR)ldapauth$(DLSUFFICS) $(LDFLAGS) $(DLFLAGS) $(LIBSPREFIX)ladp$(LIBSSUFFIX) ldapauth$(OBJSUFFICS)
diff --git a/src/plugins/PamAuth/Makefile.inc b/src/plugins/PamAuth/Makefile.inc
index 07ce480..8acd72a 100644
--- a/src/plugins/PamAuth/Makefile.inc
+++ b/src/plugins/PamAuth/Makefile.inc
@@ -4,4 +4,4 @@ pamauth$(OBJSUFFICS): pamauth.c
 	$(CC) $(DCFLAGS) $(CFLAGS) pamauth.c
 
 $(BUILDDIR)pamauth$(DLSUFFICS): pamauth$(OBJSUFFICS)
-	$(LN) $(LNOUT)../../$(BUILDDIR)pamauth$(DLSUFFICS) $(LDFLAGS) $(DLFLAGS) -lpam pamauth$(OBJSUFFICS)
+	$(LN) $(LNOUT)../../$(BUILDDIR)pamauth$(DLSUFFICS) $(LDFLAGS) $(DLFLAGS) $(LIBSPREFIX)pam$(LIBSSUFFIX) pamauth$(OBJSUFFICS)