diff options
| author | Sergey Poznyakoff <gray@gnu.org> | 2019-07-10 20:59:11 +0300 |
|---|---|---|
| committer | Sergey Poznyakoff <gray@gnu.org> | 2019-07-10 20:59:11 +0300 |
| commit | 52e61ab97d17f891e14adfef5a2e62c57e35bc07 (patch) | |
| tree | 31c7916034753577d2acc6abf5aab7862ec7a9ef | |
| parent | 0215d321436e663cede27475224620e4b7fd75f6 (diff) | |
| download | rush-52e61ab97d17f891e14adfef5a2e62c57e35bc07.tar.gz rush-52e61ab97d17f891e14adfef5a2e62c57e35bc07.tar.bz2 | |
Use wordsplit for a submodule
| -rw-r--r-- | .gitmodules | 3 | ||||
| -rw-r--r-- | lib/Makefile.am | 9 | ||||
| m--------- | lib/wordsplit | 0 | ||||
| -rw-r--r-- | src/Makefile.am | 7 |
4 files changed, 16 insertions, 3 deletions
diff --git a/.gitmodules b/.gitmodules index 956ae0e..7a0d1f7 100644 --- a/.gitmodules +++ b/.gitmodules @@ -4,3 +4,6 @@ [submodule "gnulib"] path = gnulib url = git://git.savannah.gnu.org/gnulib.git +[submodule "lib/wordsplit"] + path = lib/wordsplit + url = git://git.gnu.org.ua/wordsplit.git diff --git a/lib/Makefile.am b/lib/Makefile.am index d3c57af..2e0299a 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -26,12 +26,17 @@ librush_a_SOURCES=\ utmp.c\ version.c\ wildmatch.c\ - wordsplit.c\ - wordsplit.h\ wtmp.c +nodist_librush_a_SOURCES = wordsplit.c + +VPATH += $(srcdir)/wordsplit +EXTRA_DIST = \ + wordsplit/wordsplit.c\ + wordsplit/wordsplit.h noinst_HEADERS=librush.h AM_CPPFLAGS=\ -I$(top_srcdir)/gnu\ -I$(top_builddir)/gnu\ + -I$(srcdir)/wordsplit\ -DLOCALEDIR=\"$(localedir)\" diff --git a/lib/wordsplit b/lib/wordsplit new file mode 160000 +Subproject 6ccb9ad200f6fa0b59a3d17e7e069badb2d39e5 diff --git a/src/Makefile.am b/src/Makefile.am index 160541e..6c852ed 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -41,7 +41,12 @@ rushwho_SOURCES=rushwho.c rwopt.h rushlast.c: rlopt.h rushwho.c: rwopt.h EXTRA_DIST = rush-po rushopt.opt rlopt.opt rwopt.opt getopt.m4 defconf.sed cfgram.output -AM_CPPFLAGS=-I$(top_srcdir) -I$(top_srcdir)/gnu -I$(top_builddir)/gnu -I$(top_srcdir)/lib +AM_CPPFLAGS=\ + -I$(top_srcdir)\ + -I$(top_srcdir)/gnu\ + -I$(top_builddir)/gnu\ + -I$(top_srcdir)/lib\ + -I$(top_srcdir)/lib/wordsplit LDADD=../lib/librush.a ../gnu/libgnu.a @LTLIBINTL@ AM_INSTALLCHECK_STD_OPTIONS_EXEMPT=rush-po |