Merge lp:~ignacio-nin/percona-pam-for-mysql/percona-pam-for-mysql into lp:percona-pam-for-mysql

Proposed by Ignacio Nin
Status: Superseded
Proposed branch: lp:~ignacio-nin/percona-pam-for-mysql/percona-pam-for-mysql
Merge into: lp:percona-pam-for-mysql
Diff against target: 43 lines (+8/-14)
1 file modified
Makefile (+8/-14)
To merge this branch: bzr merge lp:~ignacio-nin/percona-pam-for-mysql/percona-pam-for-mysql
Reviewer Review Type Date Requested Status
Laurynas Biveinis (community) Needs Fixing
Review via email: mp+79113@code.launchpad.net

This proposal has been superseded by a proposal from 2011-10-17.

To post a comment you must log in.
Revision history for this message
Laurynas Biveinis (laurynas-biveinis) wrote :

(To repeat what was said on IRC)
OK with the hardcoded include path replaced by mysql_config --include

review: Needs Fixing
7. By Ignacio Nin

Use mysql_config --include

Get the include path for the mysql files from mysql_config instead of
having it hard-coded.

8. By Ignacio Nin

Migration to autotools

Migration to autotools for the project to take advantage of automake
automation, etc..

9. By Ignacio Nin

RPM integration

Include a spec file for creating RPMs.

10. By Ignacio Nin

Add a script for binary distribution

Add a script for creating binary distributions.
Include a check for pam in the configure script.

Unmerged revisions

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'Makefile'
2--- Makefile 2011-06-22 13:49:35 +0000
3+++ Makefile 2011-10-12 12:34:23 +0000
4@@ -1,21 +1,18 @@
5-MASTER_SITE:=http://www.percona.com/downloads/community
6-MYSQL_VERSION:=5.5.12
7-MYSQL_DIST:=mysql-$(MYSQL_VERSION).tar.gz
8+CC:=gcc
9+CPPFLAGS:=-isystem /usr/include/mysql
10+CFLAGS:=-fPIC -O3 -g -Wall -Wextra -Werror -fno-strict-aliasing
11+
12 PLUGINS:=auth_pam.so test_auth_pam_client.so
13
14 all : $(PLUGINS)
15
16-$(MYSQL_DIST):
17- wget $(MYSQL_DIST);
18-
19-unpack: $(MYSQL_DIST)
20- -rm -rf mysql-$(MYSQL_VERSION)
21- tar zxf $(MYSQL_DIST)
22-
23 clean:
24 -rm $(PLUGINS) auth_pam.o lib_auth_pam_client.o test_auth_pam_client.o
25
26-.PHONY : unpack all clean
27+install: $(PLUGINS)
28+ mysql_config --plugindir && install $(PLUGINS) $$(mysql_config --plugindir)
29+
30+.PHONY : unpack all clean install
31
32 %.so : %.o
33 ld -shared $^ -o $@ -lpam
34@@ -23,9 +20,6 @@
35 auth_pam.so: auth_pam.o lib_auth_pam_client.o
36 test_auth_pam_client.so: test_auth_pam_client.o lib_auth_pam_client.o
37
38-CC:=gcc
39-CPPFLAGS:=-isystem mysql-$(MYSQL_VERSION)/include
40-CFLAGS:=-fPIC -O3 -g -Wall -Wextra -Werror
41
42 auth_pam.o: auth_pam.c lib_auth_pam_client.h
43 lib_auth_pam_client.o: lib_auth_pam_client.c lib_auth_pam_client.h

Subscribers

People subscribed via source and target branches