]>
Commit | Line | Data |
---|---|---|
a7e1af7f | 1 | --- dmraid/lib/Makefile.in 2006-07-30 22:48:53.000000000 +0000 |
2 | +++ dmraid.as-needed/lib/Makefile.in 2006-07-30 22:52:10.000000000 +0000 | |
3 | @@ -53,6 +53,24 @@ | |
4 | endif | |
5 | endif | |
6 | ||
7 | +ifeq ("@KLIBC@", "yes") | |
8 | + DMRAIDLIBS += -ldevmapper_klibc | |
9 | +else | |
10 | + ifeq ("@DIETLIBC@", "yes") | |
11 | + DMRAIDLIBS += -ldevmapper_dietc | |
12 | + else | |
fb92a1d2 | 13 | + DMRAIDLIBS += -ldevmapper -lz |
a7e1af7f | 14 | + endif |
15 | + | |
16 | +# ifeq ("@LIBSELINUX@", "yes") | |
17 | +# DMRAIDLIBS += -lselinux | |
18 | +# endif | |
19 | +# | |
20 | +# ifeq ("@LIBSEPOL@", "yes") | |
21 | +# DMRAIDLIBS += -lsepol | |
22 | +# endif | |
23 | +endif | |
24 | + | |
25 | all: | |
26 | @echo "$(TARGETS) $(INSTALL_TARGETS)" | |
27 | ||
28 | --- dmraid/make.tmpl.in 2006-07-30 22:55:01.000000000 +0000 | |
29 | +++ dmraid.as-needed/make.tmpl.in 2006-07-30 22:57:38.000000000 +0000 | |
30 | @@ -129,7 +129,7 @@ | |
31 | ||
32 | %.so: $(OBJECTS) | |
33 | $(CC) -shared -Wl,-soname,$(notdir $@).$(DMRAID_LIB_VERSION) \ | |
34 | - -Wl,--version-script,.export.sym $(OBJECTS) -o $@ | |
e35372fa | 35 | + -Wl,--version-script,.export.sym $(LDFLAGS) -o $@ $(OBJECTS) $(DMRAIDLIBS) |
a7e1af7f | 36 | |
37 | $(LIB_STATIC): $(OBJECTS) | |
38 | $(RM) $@ |