mirror of
https://github.com/NixOS/nixpkgs.git
synced 2026-03-08 03:44:07 +01:00
67 lines
2.1 KiB
Diff
67 lines
2.1 KiB
Diff
:100644 100644 0000000 0000000 M Makefile.in
|
|
:100644 000000 0000000 0000000 D src/additionalFile.c
|
|
:100644 100644 0000000 0000000 M src/hello.c
|
|
:100755 100755 0000000 0000000 M tests/hello-1
|
|
|
|
diff --git b/Makefile.in a/Makefile.in
|
|
index b0f3a3d..7bacfe1 100644
|
|
--- b/Makefile.in
|
|
+++ a/Makefile.in
|
|
@@ -500,7 +500,7 @@ am_lib_libhello_a_OBJECTS = lib/libhello_a-basename-lgpl.$(OBJEXT) \
|
|
lib/libhello_a-wctype-h.$(OBJEXT) $(am__objects_51) \
|
|
lib/libhello_a-xmalloc.$(OBJEXT) \
|
|
lib/libhello_a-xalloc-die.$(OBJEXT) \
|
|
- lib/libhello_a-xstriconv.$(OBJEXT) src/additionalFile.$(OBJEXT)
|
|
+ lib/libhello_a-xstriconv.$(OBJEXT)
|
|
lib_libhello_a_OBJECTS = $(am_lib_libhello_a_OBJECTS)
|
|
am_hello_OBJECTS = src/hello.$(OBJEXT)
|
|
hello_OBJECTS = $(am_hello_OBJECTS)
|
|
@@ -2557,7 +2557,7 @@ lib_libhello_a_SOURCES = lib/basename-lgpl.c lib/c-ctype.h \
|
|
$(am__append_51) $(am__append_52) lib/version-etc.h \
|
|
lib/version-etc.c lib/version-etc-fsf.c lib/wctype-h.c \
|
|
$(am__append_53) lib/xmalloc.c lib/xalloc-die.c \
|
|
- lib/xstriconv.h lib/xstriconv.c src/additionalFile.c
|
|
+ lib/xstriconv.h lib/xstriconv.c
|
|
lib_libhello_a_CFLAGS = $(AM_CFLAGS) $(GL_CFLAG_GNULIB_WARNINGS) $(GL_CFLAG_ALLOW_WARNINGS)
|
|
lib_libhello_a_LIBADD = $(gl_libhello_LIBOBJS)
|
|
lib_libhello_a_DEPENDENCIES = $(gl_libhello_LIBOBJS)
|
|
diff --git a/src/additionalFile.c b/src/additionalFile.c
|
|
deleted file mode 100644
|
|
index 34d683d..0000000
|
|
--- a/src/additionalFile.c
|
|
+++ /dev/null
|
|
@@ -1,6 +0,0 @@
|
|
-#include "config.h"
|
|
-#include "system.h"
|
|
-
|
|
-int somefunc() {
|
|
- return 0;
|
|
-}
|
|
diff --git a/src/hello.c b/src/hello.c
|
|
index a8e36dc..53722d9 100644
|
|
--- a/src/hello.c
|
|
+++ b/src/hello.c
|
|
@@ -126,6 +126,10 @@ parse_options (int argc, char *argv[], const char **greeting_msg)
|
|
}
|
|
}
|
|
|
|
+int somefunc() {
|
|
+ return 1;
|
|
+}
|
|
+
|
|
int
|
|
main (int argc, char *argv[])
|
|
{
|
|
diff --git a/tests/hello-1 b/tests/hello-1
|
|
index 96ffef8..f0b9f8d 100755
|
|
--- a/tests/hello-1
|
|
+++ b/tests/hello-1
|
|
@@ -21,7 +21,7 @@ export LANGUAGE LC_ALL LC_MESSAGES LANG
|
|
|
|
tmpfiles="hello-test1.ok"
|
|
cat <<EOF > hello-test1.ok
|
|
-Hello, world!
|
|
+Hello, incremental world!
|
|
EOF
|
|
|
|
tmpfiles="$tmpfiles hello-test1.out"
|