nixpkgs mirror (for testing) github.com/NixOS/nixpkgs
nix
at haskell-updates 67 lines 2.3 kB view raw
1:100644 100644 0000000 0000000 M Makefile.in 2:000000 100644 0000000 0000000 A src/additionalFile.c 3:100644 100644 0000000 0000000 M src/hello.c 4:100644 100644 0000000 0000000 M src/system.h 5 6diff --git a/Makefile.in b/Makefile.in 7index 7bacfe1..b0f3a3d 100644 8--- a/Makefile.in 9+++ b/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) 15+ lib/libhello_a-xstriconv.$(OBJEXT) src/additionalFile.$(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 24+ lib/xstriconv.h lib/xstriconv.c src/additionalFile.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 29new file mode 100644 30index 0000000..34d683d 31--- /dev/null 32+++ b/src/additionalFile.c 33@@ -0,0 +1,6 @@ 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 2e7d38e..a8e36dc 100644 42--- a/src/hello.c 43+++ b/src/hello.c 44@@ -146,7 +146,11 @@ main (int argc, char *argv[]) 45 #endif 46 47 /* Having initialized gettext, get the default message. */ 48- greeting_msg = _("Hello, world!"); 49+ if (somefunc() == 0) { 50+ greeting_msg = _("Hello, world!"); 51+ } else { 52+ greeting_msg = _("Hello, incremental world!"); 53+ } 54 55 /* Even exiting has subtleties. On exit, if any writes failed, change 56 the exit status. The /dev/full device on GNU/Linux can be used for 57diff --git a/src/system.h b/src/system.h 58index d39cdb9..dc425d2 100644 59--- a/src/system.h 60+++ b/src/system.h 61@@ -59,4 +59,6 @@ 62 } \ 63 while (0) 64 65+int somefunc(); 66+ 67 #endif /* HELLO_SYSTEM_H */