ICU-57165.0.1.tar.gz

[apple/icu.git] / icuSources / tools / tzcode / Makefile.in

diff --git a/icuSources/tools/tzcode/Makefile.in b/icuSources/tools/tzcode/Makefile.in
index cd42f4e5bbf783ac7fe1979fdae9985a38697000..cb76bf3b9eea7c0f0b7d6dfe8fafb29cdcc9244c 100644 (file)
--- a/icuSources/tools/tzcode/Makefile.in
+++ b/icuSources/tools/tzcode/Makefile.in
@@ -1,4 +1,4 @@
-# Some Portions Copyright (c) 2006-2010 IBM and others. All Rights Reserved.
+# Some Portions Copyright (c) 2006-2012 IBM and others. All Rights Reserved.
 
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
@@ -31,13 +31,15 @@ ZDUMP_OPTS= -v -a -d $(ZDUMPOUT) -c 1902,2038 -i
 ICUZDUMP_OPTS= -a -d $(ICUZDUMPOUT)
 
 # Executables & objects
-OBJECTS= zic.o localtime.o asctime.o scheck.o ialloc.o
+ZICOBJECTS= zic.o localtime.o asctime.o scheck.o ialloc.o
 ZICTARG=$(BINDIR)/zic$(EXEEXT)
 ZICEXEC=$(TOOLBINDIR)/zic$(TOOLEXEEXT)
+TZ2ICUOBJ= tz2icu.o
 TZ2ICUTARG=$(BINDIR)/tz2icu$(EXEEXT)
 TZ2ICUEXEC=$(TOOLBINDIR)/tz2icu$(TOOLEXEEXT)
 ICUZDUMPTARG=$(BINDIR)/icuzdump$(EXEEXT)
 ICUZDUMPEXEC=$(TOOLBINDIR)/icuzdump$(TOOLEXEEXT)
+ICUZDUMPOBJ= icuzdump.o
 
 ifeq ($(TZDATA),)
 all: 
@@ -102,7 +104,8 @@ PRIMARY_YDATA=      africa antarctica asia australasia \
 YDATA=         $(PRIMARY_YDATA) pacificnew etcetera factory backward
 NDATA=         systemv
 SDATA=         solar87 solar88 solar89
-TDATA=         $(YDATA) $(NDATA) $(SDATA) 
+#TDATA=                $(YDATA) $(NDATA) $(SDATA)
+TDATA=         $(YDATA) $(NDATA)
 YEARISTYPE=     ./yearistype
 
 TZDIR=zoneinfo
@@ -114,22 +117,32 @@ CPPFLAGS+= -DTZDIR=\"$(TZDIR)\"
 XDATA=zone.tab yearistype.sh leapseconds iso3166.tab
 ICUDATA=ZoneMetaData.java icu_zone.txt tz2icu zoneinfo64.txt zoneinfo.txt
 
-$(ZICTARG):            $(OBJECTS) $(TDATA) yearistype $(srcdir)/tz2icu.h
-               $(CC) $(CFLAGS) $(TZORIG_EXTRA_CFLAGS) $(LFLAGS) -I$(srcdir) $(OBJECTS) $(LDLIBS) -o $@
+# create modified CXXFLAGS without -fXXX, -Wxxxx (the settings for these don't work for tz2icu)
+TZCODE_CXXFLAGS=$(patsubst -W%,,$(patsubst -f%,,$(CXXFLAGS)))
 
-$(TZ2ICUTARG): $(srcdir)/tz2icu.cpp $(srcdir)/tz2icu.h
-               $(CXX) -W -Wall $(TZ_EXTRA_CXXFLAGS) -I$(srcdir) -I$(top_srcdir)/common -pedantic $(srcdir)/tz2icu.cpp -o $@
+$(ZICTARG):            $(ZICOBJECTS) $(TDATA) yearistype $(srcdir)/tz2icu.h
+               $(CC) $(CFLAGS) $(TZORIG_EXTRA_CFLAGS) $(LFLAGS) -I$(srcdir) $(ZICOBJECTS) $(LDLIBS) -o $@
+
+$(TZ2ICUOBJ):  $(srcdir)/tz2icu.cpp $(srcdir)/tz2icu.h
+               $(CXX) -W -Wall $(TZCODE_CXXFLAGS) -I$(srcdir) -I$(top_srcdir)/common -pedantic $(srcdir)/tz2icu.cpp -c -o $@
+
+$(TZ2ICUTARG): $(TZ2ICUOBJ)
+               $(CXX) -W -Wall $(TZCODE_CXXFLAGS) -I$(srcdir) -I$(top_srcdir)/common -pedantic $(TZ2ICUOBJ) -o $@
 
 $(ICUZDUMPTARG):       $(srcdir)/icuzdump.cpp
                $(LINK.cc)  -I$(srcdir) -I$(top_srcdir)/common -I$(top_srcdir)/i18n -I$(top_srcdir)/tools/toolutil -I$(top_srcdir)/io  -pedantic $(srcdir)/icuzdump.cpp $(LIBICUUC) $(LIBICUDT) $(LIBICUI18N) $(LIBICUIO) $(LIBICUTOOLUTIL) -o $@
 
+$(ICUZDUMPOBJ):        $(srcdir)/icuzdump.cpp
+               $(CXX) -W -Wall $(TZCODE_CXXFLAGS) --std=c++0x -I$(srcdir) -I$(top_srcdir)/common -I$(top_srcdir)/i18n -I$(top_srcdir)/tools/toolutil -I$(top_srcdir)/io $(srcdir)/icuzdump.cpp -c -o $@
 
 $(TDATA): tdatamarker
 
 tdatamarker: $(TZDATA)
-       gunzip -d < $(TZDATA) | tar xf -
+       gunzip -d < $(TZDATA) | tar xf - --exclude=Makefile
        touch $@
 
+yearistype.sh: | $(TDATA)
+
 yearistype:    yearistype.sh
                cp yearistype.sh yearistype
                chmod +x yearistype
@@ -142,6 +155,8 @@ icu_data:   $(TZ2ICUEXEC) posix_only
                $(TZ2ICUEXEC) $(TZDIR) zone.tab `echo $(TZDATA) | sed -e "s/.*\/tzdata//;s/\.tar\.gz$$//"`
                $(TZ2ICUEXEC) $(TZDIR) zone.tab `echo $(TZDATA) | sed -e "s/.*\/tzdata//;s/\.tar\.gz$$//"` --old
 
+tztoolobjs: $(ZICOBJECTS) $(TZ2ICUOBJ) $(ICUZDUMPOBJ)
+
 clean:
                -rm -f core *.o *.out zdump${EXEEXT} $(ZICTARG) yearistype date $(TZ2ICUTARG)
                @echo ICU specific cleanup:
@@ -149,7 +164,7 @@ clean:
                -rm -rf $(TZDIR)
                -$(RMV) $(ICUZDUMPTARG) tzorig ./zdumpout/ ./icuzdumpout/
 ifneq ($(TZDATA),)
-               -rm -rf `gunzip -d < $(TZDATA) | tar tf - | grep -o '[^ ]*$$' | tr '\n' ' '`
+               -rm -rf `gunzip -d < $(TZDATA) | tar tf - --exclude=Makefile | grep -o '[^ ]*$$' | tr '\n' ' '`
                -rm tdatamarker
 endif