From daf2cc0fa51f613b93d095d293799e60c41d6f35 Mon Sep 17 00:00:00 2001 From: Andrea Luzzardi Date: Tue, 9 Jan 2007 00:33:12 +0000 Subject: [PATCH] =?UTF-8?q?Merged=20Petteri=20R=C3=A4ty=20=20patches=20into=20the=20trunk?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pam_usb/Makefile | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pam_usb/Makefile b/pam_usb/Makefile index 70a6032..fa383f2 100644 --- a/pam_usb/Makefile +++ b/pam_usb/Makefile @@ -3,9 +3,9 @@ DEBUG := no # compiler/linker options CC := gcc -CFLAGS := -Wall -fPIC `pkg-config --cflags libxml-2.0` \ +CFLAGS := $(CFLAGS) -Wall -fPIC `pkg-config --cflags libxml-2.0` \ `pkg-config --cflags hal-storage` -LDFLAGS := `pkg-config --libs libxml-2.0` \ +LIBS := `pkg-config --libs libxml-2.0` \ `pkg-config --libs hal-storage` # common source files @@ -23,7 +23,7 @@ OBJS := $(SRCS:.c=.o) PAM_USB_SRCS := src/pam.c PAM_USB_OBJS := $(PAM_USB_SRCS:.c=.o) PAM_USB := pam_usb.so -PAM_USB_LDFLAGS := -shared $(LDFLAGS) +PAM_USB_LDFLAGS := -shared PAM_USB_DEST := $(DESTDIR)/lib/security # pusb_check @@ -60,10 +60,10 @@ endif all : $(PAM_USB) $(PUSB_CHECK) $(PAM_USB) : $(OBJS) $(PAM_USB_OBJS) - $(CC) -o $(PAM_USB) $(PAM_USB_LDFLAGS) $(OBJS) $(PAM_USB_OBJS) + $(CC) -o $(PAM_USB) $(PAM_USB_LDFLAGS) $(LDFLAGS) $(OBJS) $(PAM_USB_OBJS) $(LIBS) $(PUSB_CHECK) : $(OBJS) $(PUSB_CHECK_OBJS) - $(CC) -o $(PUSB_CHECK) $(LDFLAGS) $(OBJS) $(PUSB_CHECK_OBJS) + $(CC) -o $(PUSB_CHECK) $(LDFLAGS) $(OBJS) $(PUSB_CHECK_OBJS) $(LIBS) %.o : %.c ${CC} -c ${CFLAGS} $< -o $@ @@ -73,7 +73,7 @@ clean : install : all $(MKDIR) -p $(CONFS_DEST) $(DOCS_DEST) - $(INSTALL) -m644 $(PAM_USB) $(PAM_USB_DEST) + $(INSTALL) -m755 $(PAM_USB) $(PAM_USB_DEST) $(INSTALL) -m755 $(PUSB_CHECK) $(PUSB_CONF) $(PUSB_HOTPLUG) $(TOOLS_DEST) $(INSTALL) -m644 $(CONFS) $(CONFS_DEST) $(INSTALL) -m644 $(DOCS) $(DOCS_DEST)