aboutsummaryrefslogtreecommitdiff
path: root/windows
diff options
context:
space:
mode:
authorLasse Collin <lasse.collin@tukaani.org>2009-06-26 20:36:45 +0300
committerLasse Collin <lasse.collin@tukaani.org>2009-06-26 20:36:45 +0300
commitcad62551c5fa9865dbe0841a0b3bc729c4fbe8fc (patch)
tree18c034dce54895c884ce480780b47f4ca3092f4b /windows
parentAdded missing source files to windows/Makefile. (diff)
downloadxz-cad62551c5fa9865dbe0841a0b3bc729c4fbe8fc.tar.xz
Ugly hack to make it possible to use the thousand separator
format character with snprintf() on POSIX systems but not on non-POSIX systems and still keep xgettext working.
Diffstat (limited to 'windows')
-rw-r--r--windows/Makefile13
1 files changed, 3 insertions, 10 deletions
diff --git a/windows/Makefile b/windows/Makefile
index 2da34506..192348bd 100644
--- a/windows/Makefile
+++ b/windows/Makefile
@@ -283,24 +283,17 @@ XZ_SRCS = \
../src/xz/suffix.c \
../src/xz/util.c
-XZ_SRCS_FIXED = $(XZ_SRCS:.c=-fixed.c)
XZ_OBJS = $(XZ_SRCS:.c=.o)
XZ_OBJS_STATIC = $(XZ_SRCS:.c=-static.o)
-$(XZ_SRCS_FIXED): %-fixed.c: %.c
- $(SED) "s/%'/%/g" $< > $@
-
-# We need to "fix" the source files which use ' as format character
-# in printf() to get thousand separators. Windows doesn't support it.
-# It's not in C89 or C99, but it is in POSIX.
-$(XZ_OBJS): %.o: %-fixed.c
+$(XZ_OBJS): %.o: %.c
$(CC) $(ALL_CPPFLAGS) $(ALL_CFLAGS) -c -o $@ $<
xz-dynamic.exe: liblzma.dll $(XZ_OBJS) xz_rc.o
$(CC) $(ALL_CFLAGS) $(XZ_OBJS) xz_rc.o -o $@ liblzma.a
$(STRIP) --strip-all $@
-$(XZ_OBJS_STATIC): %-static.o: %-fixed.c
+$(XZ_OBJS_STATIC): %-static.o: %.c
$(CC) -DLZMA_API_STATIC $(ALL_CPPFLAGS) $(ALL_CFLAGS) -c -o $@ $<
xz.exe: liblzma_static.lib $(XZ_OBJS_STATIC) xz_rc.o
@@ -309,4 +302,4 @@ xz.exe: liblzma_static.lib $(XZ_OBJS_STATIC) xz_rc.o
.PHONY: xz-clean
xz-clean:
- -$(RM) $(XZ_OBJS) $(XZ_OBJS_STATIC) $(XZ_SRCS_FIXED) xz_rc.o xz-dynamic.exe xz.exe
+ -$(RM) $(XZ_OBJS) $(XZ_OBJS_STATIC) xz_rc.o xz-dynamic.exe xz.exe