ICU-461.18.tar.gz

[apple/icu.git] / icuSources / layoutex / Makefile.in

diff --git a/icuSources/layoutex/Makefile.in b/icuSources/layoutex/Makefile.in
index dcfee9706f246b2ffdb7d1a4d3768d3302d47ce5..71e37f64503127d0e2864149415c38a2d88a091d 100644 (file)
--- a/icuSources/layoutex/Makefile.in
+++ b/icuSources/layoutex/Makefile.in
@@ -1,6 +1,6 @@
 #******************************************************************************
 #
 #******************************************************************************
 #

-#   Copyright (C) 1999-2005, International Business Machines
+#   Copyright (C) 1999-2008, International Business Machines

 #   Corporation and others.  All Rights Reserved.
 #
 #******************************************************************************
 #   Corporation and others.  All Rights Reserved.
 #
 #******************************************************************************


@@ -49,6 +49,8 @@ ALL_TARGETS = $(TARGET) $(ALL_SO_TARGETS) $(BATCH_TARGET)
 DYNAMICCPPFLAGS = $(SHAREDLIBCPPFLAGS)
 DYNAMICCFLAGS = $(SHAREDLIBCFLAGS)
 DYNAMICCXXFLAGS = $(SHAREDLIBCXXFLAGS)
 DYNAMICCPPFLAGS = $(SHAREDLIBCPPFLAGS)
 DYNAMICCFLAGS = $(SHAREDLIBCFLAGS)
 DYNAMICCXXFLAGS = $(SHAREDLIBCXXFLAGS)

+CFLAGS += $(LIBCFLAGS)
+CXXFLAGS += $(LIBCXXFLAGS)

 
 ifneq ($(top_builddir),$(top_srcdir))
 CPPFLAGS += -I$(top_builddir)/common
 
 ifneq ($(top_builddir),$(top_srcdir))
 CPPFLAGS += -I$(top_builddir)/common


@@ -60,10 +62,12 @@ LIBS = $(LIBICUUC) $(LIBICULE) $(DEFAULT_LIBS)
 
 OBJECTS =  ParagraphLayout.o \
 RunArrays.o \
 
 OBJECTS =  ParagraphLayout.o \
 RunArrays.o \

-LXUtilities.o  
+LXUtilities.o  \
+playout.o \
+plruns.o

 
 ## Header files to install
 
 ## Header files to install

-HEADERS= $(srcdir)/layout/ParagraphLayout.h $(srcdir)/layout/RunArrays.h
+HEADERS= $(srcdir)/layout/ParagraphLayout.h $(srcdir)/layout/RunArrays.h $(srcdir)/layout/playout.h $(srcdir)/layout/plruns.h

 
 STATIC_OBJECTS = $(OBJECTS:.o=.$(STATIC_O))
 
 
 STATIC_OBJECTS = $(OBJECTS:.o=.$(STATIC_O))
 


@@ -104,7 +108,6 @@ ifneq ($(FINAL_SO_TARGET),$(MIDDLE_SO_TARGET))
        cd $(DESTDIR)$(libdir) && $(RM) $(notdir $(MIDDLE_SO_TARGET)) && ln -s $(notdir $(FINAL_SO_TARGET)) $(notdir $(MIDDLE_SO_TARGET))
 endif
 endif
        cd $(DESTDIR)$(libdir) && $(RM) $(notdir $(MIDDLE_SO_TARGET)) && ln -s $(notdir $(FINAL_SO_TARGET)) $(notdir $(MIDDLE_SO_TARGET))
 endif
 endif

-endif

 ifneq ($(IMPORT_LIB_EXT),)
        $(INSTALL-L) $(FINAL_IMPORT_LIB) $(DESTDIR)$(libdir)
 ifneq ($(IMPORT_LIB),$(FINAL_IMPORT_LIB))
 ifneq ($(IMPORT_LIB_EXT),)
        $(INSTALL-L) $(FINAL_IMPORT_LIB) $(DESTDIR)$(libdir)
 ifneq ($(IMPORT_LIB),$(FINAL_IMPORT_LIB))


@@ -114,6 +117,7 @@ ifneq ($(MIDDLE_IMPORT_LIB),$(FINAL_IMPORT_LIB))
        cd $(DESTDIR)$(libdir) && $(RM) $(notdir $(MIDDLE_IMPORT_LIB)) && ln -s $(notdir $(FINAL_IMPORT_LIB)) $(notdir $(MIDDLE_IMPORT_LIB))
 endif
 endif
        cd $(DESTDIR)$(libdir) && $(RM) $(notdir $(MIDDLE_IMPORT_LIB)) && ln -s $(notdir $(FINAL_IMPORT_LIB)) $(notdir $(MIDDLE_IMPORT_LIB))
 endif
 endif

+endif

 
 install-headers:
        $(MKINSTALLDIRS) $(DESTDIR)$(includedir)/layout
 
 install-headers:
        $(MKINSTALLDIRS) $(DESTDIR)$(includedir)/layout


@@ -138,7 +142,8 @@ Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
         && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
 
 ifneq ($(ENABLE_STATIC),)
         && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
 
 ifneq ($(ENABLE_STATIC),)

-$(TARGET): $(TARGET)($(STATIC_OBJECTS))
+$(TARGET): $(STATIC_OBJECTS)
+       $(AR) $(ARFLAGS) $(AR_OUTOPT)$@ $^

        $(RANLIB) $@
 endif
 
        $(RANLIB) $@
 endif