X-Git-Url: https://git.saurik.com/apple/icu.git/blobdiff_plain/374ca955a76ecab1204ca8bfa63ff9238d998416..73c04bcfe1096173b00431f0cdc742894b15eef0:/icuSources/tools/makeconv/Makefile.in

diff --git a/icuSources/tools/makeconv/Makefile.in b/icuSources/tools/makeconv/Makefile.in
index d7750c49..91e2124d 100644
--- a/icuSources/tools/makeconv/Makefile.in
+++ b/icuSources/tools/makeconv/Makefile.in
@@ -1,5 +1,5 @@
 ## Makefile.in for ICU - tools/makeconv
-## Copyright (c) 1999-2004, International Business Machines Corporation and
+## Copyright (c) 1999-2005, International Business Machines Corporation and
 ## others. All Rights Reserved.
 ## Stephen F. Booth
 
@@ -11,38 +11,34 @@ top_builddir = ../..
 
 include $(top_builddir)/icudefs.mk
 
-##
+## Build directory information
+subdir = tools/makeconv
 
 TARGET_STUB_NAME = makeconv
 
 SECTION = 1
 
-MANX_FILES = $(TARGET_STUB_NAME).$(SECTION)
-
-ALL_MAN_FILES = $(MANX_FILES)
-
-
-## Build directory information
-subdir = tools/makeconv
+MAN_FILES = $(TARGET_STUB_NAME).$(SECTION)
 
 ## Extra files to remove for 'make clean'
-CLEANFILES = *~ $(ALL_MAN_FILES) $(DEPS)
+CLEANFILES = *~ $(DEPS) $(MAN_FILES)
 
 ## Target information
 TARGET = $(BINDIR)/$(TARGET_STUB_NAME)$(EXEEXT)
 
-CPPFLAGS += -I$(top_builddir)/common -I$(top_srcdir)/common -I$(srcdir)/../toolutil
-LIBS = $(LIBICUTOOLUTIL) $(LIBICUUC) $(DEFAULT_LIBS) $(LIB_M)
+ifneq ($(top_builddir),$(top_srcdir))
+CPPFLAGS += -I$(top_builddir)/common
+endif
+CPPFLAGS += -I$(top_srcdir)/common -I$(srcdir)/../toolutil
+LIBS = $(LIBICUTOOLUTIL) $(LIBICUI18N) $(LIBICUUC) $(DEFAULT_LIBS) $(LIB_M)
 
 OBJECTS = makeconv.o ucnvstat.o genmbcs.o gencnvex.o
 
 DEPS = $(OBJECTS:.o=.d)
 
-
 ## List of phony targets
-.PHONY : all all-local install install-local install-man clean clean-local \
-    distclean distclean-local dist dist-local check \
-    check-local
+.PHONY : all all-local install install-local clean clean-local	\
+distclean distclean-local dist dist-local check check-local install-man
 
 ## Clear suffix list
 .SUFFIXES :
@@ -55,17 +51,18 @@ distclean : distclean-local
 dist: dist-local
 check: all check-local
 
-all-local: $(TARGET) $(ALL_MAN_FILES)
+all-local: $(TARGET) $(MAN_FILES)
 
 install-local: all-local install-man
 	$(MKINSTALLDIRS) $(DESTDIR)$(bindir)
 	$(INSTALL) $(TARGET) $(DESTDIR)$(bindir)
 
-dist-local:
+install-man: $(MAN_FILES)
+	$(MKINSTALLDIRS) $(DESTDIR)$(mandir)/man$(SECTION)
+	$(INSTALL_DATA) $? $(DESTDIR)$(mandir)/man$(SECTION)
 
-rebuild: $(TARGET)
-	-$(RMV) 
-	$(MAKE) all-local
+
+dist-local:
 
 clean-local:
 	test -z "$(CLEANFILES)" || $(RMV) $(CLEANFILES)
@@ -76,18 +73,13 @@ distclean-local: clean-local
 
 check-local: all-local
 
-
 Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
 	cd $(top_builddir) \
 	 && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
 
-$(TARGET): $(OBJECTS)
+$(TARGET) : $(OBJECTS)
 	$(LINK.cc) $(OUTOPT)$@ $^ $(LIBS)
 
-install-man: install-manx
-install-manx: $(MANX_FILES)
-	$(MKINSTALLDIRS) $(DESTDIR)$(mandir)/man$(SECTION)
-	$(INSTALL_DATA) $? $(DESTDIR)$(mandir)/man$(SECTION)
 
 %.$(SECTION): $(srcdir)/%.$(SECTION).in
 	cd $(top_builddir) \
@@ -101,3 +93,4 @@ ifneq ($(patsubst %clean,,$(MAKECMDGOALS)),)
 -include $(DEPS)
 endif
 endif
+