diff options
| author | Andrew G. Morgan <morgan@kernel.org> | 2001-12-09 22:15:11 +0000 |
|---|---|---|
| committer | Andrew G. Morgan <morgan@kernel.org> | 2001-12-09 22:15:11 +0000 |
| commit | da67a7d6126846939fd43b1ddb5aa8c06ee09301 (patch) | |
| tree | e9df9e69023b0e8584ee85cd8a44daf210bee75d /modules/Simple.Rules | |
| parent | cb7734d4080f3673a34594ee4c6e7b02dcd89f33 (diff) | |
Relevant BUGIDs: 490938
Purpose of commit: new feature
Commit summary:
---------------
Added libpammodutil and link it with every module as its built.
The issue here is that there is a lot of code that the various modules
use in common, and this staic library can be used to help make this code
more maintainable. I do not intend to make this library dynamic. Especially
right now, as I want to be free to chop and change the API and don't want
to deal with revision control and third party modules.
This checkin makes the pam_rhost_auth module make some use of this new
library. I don't intend to add support for any other module prior to
releasing 0.76.
Diffstat (limited to 'modules/Simple.Rules')
| -rw-r--r-- | modules/Simple.Rules | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/modules/Simple.Rules b/modules/Simple.Rules index 04fafc12..2d79b00c 100644 --- a/modules/Simple.Rules +++ b/modules/Simple.Rules @@ -19,6 +19,9 @@ LIBOBJ = $(addsuffix .o,$(LIBFILES)) LIBOBJD = $(addprefix dynamic/,$(LIBOBJ)) LIBOBJS = $(addprefix static/,$(LIBOBJ)) +LINK_PAMMODUTILS = -L../pammodutil -lpammodutil +INCLUDE_PAMMODUTILS = -I../pammodutil/include + ifdef DYNAMIC LIBSHARED = $(TITLE).so endif @@ -32,10 +35,10 @@ endif all: dirs $(LIBSHARED) $(LIBSTATIC) register dynamic/%.o : %.c - $(CC) $(CFLAGS) $(DYNAMIC) $(TARGET_ARCH) -c $< -o $@ + $(CC) $(CFLAGS) $(INCLUDE_PAMMODUTILS) $(DYNAMIC) $(TARGET_ARCH) -c $< -o $@ static/%.o : %.c - $(CC) $(CFLAGS) $(STATIC) $(TARGET_ARCH) -c $< -o $@ + $(CC) $(CFLAGS) $(INCLUDE_PAMMODUTILS) $(STATIC) $(TARGET_ARCH) -c $< -o $@ dirs: ifdef DYNAMIC @@ -56,7 +59,7 @@ endif ifdef DYNAMIC $(LIBSHARED): $(LIBOBJD) - $(LD_D) -o $@ $(LIBOBJD) $(MODULE_SIMPLE_EXTRALIBS) $(NEED_LINK_LIB_C) + $(LD_D) -o $@ $(LIBOBJD) $(MODULE_SIMPLE_EXTRALIBS) $(NEED_LINK_LIB_C) $(LINK_PAMMODUTILS) endif @@ -66,7 +69,7 @@ endif ifdef STATIC $(LIBSTATIC): $(LIBOBJS) - $(LD) -r -o $@ $(LIBOBJS) $(MODULE_SIMPLE_EXTRALIBS) + $(LD) -r -o $@ $(LIBOBJS) $(MODULE_SIMPLE_EXTRALIBS) $(LINK_PAMMODUTILS) endif install: all |