Browse Source

Now we only generate 1 libttail.a file

Yann Weber 7 years ago
parent
commit
3f0432e41a
2 changed files with 6 additions and 8 deletions
  1. 3
    5
      src/Makefile.am
  2. 3
    3
      tests/Makefile.am

+ 3
- 5
src/Makefile.am View File

@@ -1,13 +1,11 @@
1 1
 bin_PROGRAMS = ttail
2
-noinst_LIBRARIES=libttail_init.a libttail_search.a
2
+noinst_LIBRARIES= libttail.a
3 3
 
4
-libttail_init_a_SOURCES = ttail_init.c
5
-libttail_search_a_SOURCES = ttail_search.c
6 4
 ttail_SOURCES = main.c ttail_init.c ttail_search.c
5
+libttail_a_SOURCES = ttail_init.c ttail_search.c
7 6
 if HUGEFILE
8 7
 ttail_CFLAGS = @CFLAGS@ -DTTAIL_HUGE_FILE
9
-libttail_search_a_CFLAGS = @CFLAGS@ -DTTAIL_HUGE_FILE
10
-libttail_init_a_CFLAGS = @CFLAGS@ -DTTAIL_HUGE_FILE
8
+libttail_a_CFLAGS = @CFLAGS@ -DTTAIL_HUGE_FILE
11 9
 endif
12 10
 
13 11
 if DEBUG

+ 3
- 3
tests/Makefile.am View File

@@ -3,12 +3,12 @@ check_PROGRAMS = ttail_argparse_check ttail_init_check ttail_search_check
3 3
 
4 4
 ttail_argparse_check_SOURCES = ttail_argparse_check.c
5 5
 ttail_argparse_check_CFLAGS = @CHECK_CFLAGS@
6
-ttail_argparse_check_LDADD =  $(top_builddir)/src/libttail_init.a @CHECK_LIBS@
6
+ttail_argparse_check_LDADD =  $(top_builddir)/src/libttail.a @CHECK_LIBS@
7 7
 
8 8
 ttail_init_check_SOURCES = ttail_init_check.c
9 9
 ttail_init_check_CFLAGS = @CHECK_CFLAGS@
10
-ttail_init_check_LDADD =  $(top_builddir)/src/libttail_init.a @CHECK_LIBS@
10
+ttail_init_check_LDADD =  $(top_builddir)/src/libttail.a @CHECK_LIBS@
11 11
 
12 12
 ttail_search_check_SOURCES = ttail_search_check.c
13 13
 ttail_search_check_CFLAGS = @CHECK_CFLAGS@ -D_NOSTATIC
14
-ttail_search_check_LDADD =  $(top_builddir)/src/libttail_search.a @CHECK_LIBS@
14
+ttail_search_check_LDADD =  $(top_builddir)/src/libttail.a @CHECK_LIBS@

Loading…
Cancel
Save