diff options
| author | jbj <devnull@localhost> | 2005-02-12 19:03:32 +0000 |
|---|---|---|
| committer | jbj <devnull@localhost> | 2005-02-12 19:03:32 +0000 |
| commit | 66a6ab533f9f0a293a049dd7f154cedfc614a331 (patch) | |
| tree | 4e8d6c42e230097603adbbe67ba9b7a54c60c2f5 /file/src | |
| parent | 4bfb4d6f3fdeab36404947a2a63d88aa70f48760 (diff) | |
| download | librpm-tizen-66a6ab533f9f0a293a049dd7f154cedfc614a331.tar.gz librpm-tizen-66a6ab533f9f0a293a049dd7f154cedfc614a331.tar.bz2 librpm-tizen-66a6ab533f9f0a293a049dd7f154cedfc614a331.zip | |
- zlib: uniqify certain symbols to prevent name space pollution.
- macosx: include <sys/types.h> so that python sees the u_char typedef.
CVS patchset: 7760
CVS date: 2005/02/12 19:03:32
Diffstat (limited to 'file/src')
| -rw-r--r-- | file/src/Makefile.am | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/file/src/Makefile.am b/file/src/Makefile.am index 076ffc31a..8b1e861fd 100644 --- a/file/src/Makefile.am +++ b/file/src/Makefile.am @@ -3,6 +3,9 @@ BUILT_SOURCES = listobjs EXTRA_DIST = test.c +# XXX Make sure compress.c links internal zlib +INCLUDES = -I. -I ../../zlib + pkglibdir = @prefix@/lib/rpm MAGIC = $(pkglibdir)/magic @@ -23,7 +26,7 @@ libmagic_la_LDFLAGS = -version-info 1:0:0 noinst_PROGRAMS = file file_SOURCES = file.c -file_LDFLAGS = # -all-static +file_LDFLAGS = -L../../zlib # -all-static file_LDADD = libmagic.la listobjs: |