diff options
Diffstat (limited to 'lib/libunicode')
| -rw-r--r-- | lib/libunicode/Makefile.am | 10 | ||||
| -rw-r--r-- | lib/libunicode/Makefile.in | 33 |
2 files changed, 16 insertions, 27 deletions
diff --git a/lib/libunicode/Makefile.am b/lib/libunicode/Makefile.am index 9d5785595..bdf0491dc 100644 --- a/lib/libunicode/Makefile.am +++ b/lib/libunicode/Makefile.am @@ -3,13 +3,11 @@ include $(top_srcdir)/config/Rules.am AM_CFLAGS += $(DEBUG_STACKFLAGS) $(FRAME_LARGER_THAN) DEFAULT_INCLUDES += \ - -I${top_srcdir}/module/unicode/include \ - -I${top_srcdir}/lib/libspl/include + -I$(top_srcdir)/include \ + -I$(top_srcdir)/lib/libspl/include lib_LTLIBRARIES = libunicode.la libunicode_la_SOURCES = \ - ${top_srcdir}/module/unicode/u8_textprep.c \ - ${top_srcdir}/module/unicode/uconv.c \ - ${top_srcdir}/module/unicode/include/sys/u8_textprep.h \ - ${top_srcdir}/module/unicode/include/sys/u8_textprep_data.h + $(top_srcdir)/module/unicode/u8_textprep.c \ + $(top_srcdir)/module/unicode/uconv.c diff --git a/lib/libunicode/Makefile.in b/lib/libunicode/Makefile.in index 43145f277..035a243c3 100644 --- a/lib/libunicode/Makefile.in +++ b/lib/libunicode/Makefile.in @@ -144,14 +144,12 @@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ -BUILDDIR = @BUILDDIR@ CC = @CC@ CCAS = @CCAS@ CCASDEPMODE = @CCASDEPMODE@ CCASFLAGS = @CCASFLAGS@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ -CMDDIR = @CMDDIR@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ @@ -189,7 +187,6 @@ KERNELMAKE_PARAMS = @KERNELMAKE_PARAMS@ LD = @LD@ LDFLAGS = @LDFLAGS@ LIBBLKID = @LIBBLKID@ -LIBDIR = @LIBDIR@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ @@ -204,7 +201,6 @@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MKDIR_P = @MKDIR_P@ -MODDIR = @MODDIR@ NM = @NM@ NMEDIT = @NMEDIT@ OBJDUMP = @OBJDUMP@ @@ -223,7 +219,6 @@ RPM = @RPM@ RPMBUILD = @RPMBUILD@ RPMBUILD_VERSION = @RPMBUILD_VERSION@ RPM_VERSION = @RPM_VERSION@ -SCRIPTDIR = @SCRIPTDIR@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ @@ -233,7 +228,6 @@ SPL_SYMBOLS = @SPL_SYMBOLS@ SPL_VERSION = @SPL_VERSION@ STRIP = @STRIP@ TARGET_ASM_DIR = @TARGET_ASM_DIR@ -TOPDIR = @TOPDIR@ VENDOR = @VENDOR@ VERSION = @VERSION@ ZFS_CONFIG = @ZFS_CONFIG@ @@ -304,9 +298,8 @@ target_vendor = @target_vendor@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -DEFAULT_INCLUDES = -include ${top_srcdir}/zfs_config.h \ - -I${top_srcdir}/module/unicode/include \ - -I${top_srcdir}/lib/libspl/include +DEFAULT_INCLUDES = -include ${top_builddir}/zfs_config.h \ + -I$(top_srcdir)/include -I$(top_srcdir)/lib/libspl/include AM_LIBTOOLFLAGS = --silent AM_CFLAGS = -Wall -Wstrict-prototypes -fno-strict-aliasing \ ${DEBUG_CFLAGS} -D_GNU_SOURCE -D__EXTENSIONS__ -D_REENTRANT \ @@ -315,10 +308,8 @@ AM_CFLAGS = -Wall -Wstrict-prototypes -fno-strict-aliasing \ $(DEBUG_STACKFLAGS) $(FRAME_LARGER_THAN) lib_LTLIBRARIES = libunicode.la libunicode_la_SOURCES = \ - ${top_srcdir}/module/unicode/u8_textprep.c \ - ${top_srcdir}/module/unicode/uconv.c \ - ${top_srcdir}/module/unicode/include/sys/u8_textprep.h \ - ${top_srcdir}/module/unicode/include/sys/u8_textprep_data.h + $(top_srcdir)/module/unicode/u8_textprep.c \ + $(top_srcdir)/module/unicode/uconv.c all: all-am @@ -421,21 +412,21 @@ distclean-compile: @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< -u8_textprep.lo: ${top_srcdir}/module/unicode/u8_textprep.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT u8_textprep.lo -MD -MP -MF $(DEPDIR)/u8_textprep.Tpo -c -o u8_textprep.lo `test -f '${top_srcdir}/module/unicode/u8_textprep.c' || echo '$(srcdir)/'`${top_srcdir}/module/unicode/u8_textprep.c +u8_textprep.lo: $(top_srcdir)/module/unicode/u8_textprep.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT u8_textprep.lo -MD -MP -MF $(DEPDIR)/u8_textprep.Tpo -c -o u8_textprep.lo `test -f '$(top_srcdir)/module/unicode/u8_textprep.c' || echo '$(srcdir)/'`$(top_srcdir)/module/unicode/u8_textprep.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/u8_textprep.Tpo $(DEPDIR)/u8_textprep.Plo @am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='${top_srcdir}/module/unicode/u8_textprep.c' object='u8_textprep.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$(top_srcdir)/module/unicode/u8_textprep.c' object='u8_textprep.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o u8_textprep.lo `test -f '${top_srcdir}/module/unicode/u8_textprep.c' || echo '$(srcdir)/'`${top_srcdir}/module/unicode/u8_textprep.c +@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o u8_textprep.lo `test -f '$(top_srcdir)/module/unicode/u8_textprep.c' || echo '$(srcdir)/'`$(top_srcdir)/module/unicode/u8_textprep.c -uconv.lo: ${top_srcdir}/module/unicode/uconv.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT uconv.lo -MD -MP -MF $(DEPDIR)/uconv.Tpo -c -o uconv.lo `test -f '${top_srcdir}/module/unicode/uconv.c' || echo '$(srcdir)/'`${top_srcdir}/module/unicode/uconv.c +uconv.lo: $(top_srcdir)/module/unicode/uconv.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT uconv.lo -MD -MP -MF $(DEPDIR)/uconv.Tpo -c -o uconv.lo `test -f '$(top_srcdir)/module/unicode/uconv.c' || echo '$(srcdir)/'`$(top_srcdir)/module/unicode/uconv.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/uconv.Tpo $(DEPDIR)/uconv.Plo @am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='${top_srcdir}/module/unicode/uconv.c' object='uconv.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$(top_srcdir)/module/unicode/uconv.c' object='uconv.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o uconv.lo `test -f '${top_srcdir}/module/unicode/uconv.c' || echo '$(srcdir)/'`${top_srcdir}/module/unicode/uconv.c +@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o uconv.lo `test -f '$(top_srcdir)/module/unicode/uconv.c' || echo '$(srcdir)/'`$(top_srcdir)/module/unicode/uconv.c mostlyclean-libtool: -rm -f *.lo |