tjh.dev
nixpkgs mirror (for testing)
github.com/NixOS/nixpkgs
nix
1:100644 100644 0000000 0000000 M Makefile.in
2:100644 000000 0000000 0000000 D src/additionalFile.c
3:100644 100644 0000000 0000000 M src/hello.c
4:100755 100755 0000000 0000000 M tests/hello-1
5
6diff --git b/Makefile.in a/Makefile.in
7index b0f3a3d..7bacfe1 100644
8--- b/Makefile.in
9+++ a/Makefile.in
10@@ -500,7 +500,7 @@ am_lib_libhello_a_OBJECTS = lib/libhello_a-basename-lgpl.$(OBJEXT) \
11 lib/libhello_a-wctype-h.$(OBJEXT) $(am__objects_51) \
12 lib/libhello_a-xmalloc.$(OBJEXT) \
13 lib/libhello_a-xalloc-die.$(OBJEXT) \
14- lib/libhello_a-xstriconv.$(OBJEXT) src/additionalFile.$(OBJEXT)
15+ lib/libhello_a-xstriconv.$(OBJEXT)
16 lib_libhello_a_OBJECTS = $(am_lib_libhello_a_OBJECTS)
17 am_hello_OBJECTS = src/hello.$(OBJEXT)
18 hello_OBJECTS = $(am_hello_OBJECTS)
19@@ -2557,7 +2557,7 @@ lib_libhello_a_SOURCES = lib/basename-lgpl.c lib/c-ctype.h \
20 $(am__append_51) $(am__append_52) lib/version-etc.h \
21 lib/version-etc.c lib/version-etc-fsf.c lib/wctype-h.c \
22 $(am__append_53) lib/xmalloc.c lib/xalloc-die.c \
23- lib/xstriconv.h lib/xstriconv.c src/additionalFile.c
24+ lib/xstriconv.h lib/xstriconv.c
25 lib_libhello_a_CFLAGS = $(AM_CFLAGS) $(GL_CFLAG_GNULIB_WARNINGS) $(GL_CFLAG_ALLOW_WARNINGS)
26 lib_libhello_a_LIBADD = $(gl_libhello_LIBOBJS)
27 lib_libhello_a_DEPENDENCIES = $(gl_libhello_LIBOBJS)
28diff --git a/src/additionalFile.c b/src/additionalFile.c
29deleted file mode 100644
30index 34d683d..0000000
31--- a/src/additionalFile.c
32+++ /dev/null
33@@ -1,6 +0,0 @@
34-#include "config.h"
35-#include "system.h"
36-
37-int somefunc() {
38- return 0;
39-}
40diff --git a/src/hello.c b/src/hello.c
41index a8e36dc..53722d9 100644
42--- a/src/hello.c
43+++ b/src/hello.c
44@@ -126,6 +126,10 @@ parse_options (int argc, char *argv[], const char **greeting_msg)
45 }
46 }
47
48+int somefunc() {
49+ return 1;
50+}
51+
52 int
53 main (int argc, char *argv[])
54 {
55diff --git a/tests/hello-1 b/tests/hello-1
56index 96ffef8..f0b9f8d 100755
57--- a/tests/hello-1
58+++ b/tests/hello-1
59@@ -21,7 +21,7 @@ export LANGUAGE LC_ALL LC_MESSAGES LANG
60
61 tmpfiles="hello-test1.ok"
62 cat <<EOF > hello-test1.ok
63-Hello, world!
64+Hello, incremental world!
65 EOF
66
67 tmpfiles="$tmpfiles hello-test1.out"