[pclasses-cvs] pclasses2/src/Unicode Makefile.toc,1.5,1.6

[stephan b. <sg...@us...>]

Update of /cvsroot/pclasses/pclasses2/src/Unicode
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22850/src/Unicode

Modified Files:
	Makefile.toc 
Log Message:
Now differentiates between dev and dist trees for purposes of cleaning (or not) unicode-related in/out files.

Index: Makefile.toc
===================================================================
RCS file: /cvsroot/pclasses/pclasses2/src/Unicode/Makefile.toc,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- Makefile.toc	24 Dec 2004 23:06:27 -0000	1.5
+++ Makefile.toc	28 Dec 2004 19:43:45 -0000	1.6
@@ -1,55 +1,81 @@
 #!/usr/bin/make -f
 include toc.make
 
+########################################################################
+# If this is a dev tree we need to treat some generated files differently
+# than a dist tree...
+ifneq (,$(wildcard ./CVS/*))
+  THIS_IS_A_DEV_TREE = 1
+else
+  THIS_IS_A_DEV_TREE = 0
+endif
+
 SOURCES = Char.cpp \
 	String.cpp \
 	TextStream.cpp
 
-SOURCES_GEN = unicodedata.h unicodedata_extra.h
+SOURCES_UNICODE_GEN = unicodedata.h unicodedata_extra.h
+
+INSTALL_HEADERS = $(SOURCES_UNICODE_GEN)
 
 OBJECTS = Char.o \
 	String.o \
 	TextStream.o
-$(OBJECTS): $(SOURCES_GEN)
 
+$(OBJECTS): $(SOURCES_UNICODE_GEN)
+
+UNICODE_DATA_FILE = UnicodeData.txt
+UNICODE_DATA_URL = http://www.unicode.org/Public/UNIDATA/$(UNICODE_DATA_FILE)
 
-DIST_FILES += $(SOURCES)
+
+DIST_FILES += $(SOURCES) $(UNICODE_DATA_FILE) $(SOURCES_UNICODE_GEN)
 
 CLEAN_FILES += $(OBJECTS)
 
-build_libs = 1
 LIBNAME = lib$(LIBPUNICODE_BASENAME)
-ifeq (1,$(build_libs))
-  STATIC_LIBS = $(LIBNAME)
-  SHARED_LIBS = $(STATIC_LIBS)
-  SHARED_LIBS_LDADD = $(P_BACKLINK_LDADD) $(LIBPUNICODE_LDADD)
-  $(LIBNAME)_a_OBJECTS = $(OBJECTS)
-  $(LIBNAME)_so_OBJECTS = $($(LIBNAME)_a_OBJECTS)
-  $(LIBNAME)_so_VERSION = $(PACKAGE_VERSION)
+STATIC_LIBS = $(LIBNAME)
+SHARED_LIBS = $(STATIC_LIBS)
+SHARED_LIBS_LDADD = $(P_BACKLINK_LDADD) $(LIBPUNICODE_LDADD)
+$(LIBNAME)_a_OBJECTS = $(OBJECTS)
+$(LIBNAME)_so_OBJECTS = $($(LIBNAME)_a_OBJECTS)
+$(LIBNAME)_so_VERSION = $(PACKAGE_VERSION)
 #  $(LIBNAME)_so_LDADD = 
-  include $(TOC_MAKESDIR)/SHARED_LIBS.make
-  include $(TOC_MAKESDIR)/STATIC_LIBS.make
-  # Run targets STATIC_LIBS and SHARED_LIBS build these.
-endif
+include $(TOC_MAKESDIR)/SHARED_LIBS.make
+include $(TOC_MAKESDIR)/STATIC_LIBS.make
+# Run targets STATIC_LIBS and SHARED_LIBS build these.
 
-UNICODE_DATA_FILE = UnicodeData.txt
-UNICODE_DATA_URL = http://www.unicode.org/Public/UNIDATA/$(UNICODE_DATA_FILE)
-INSTALL_HEADERS = $(SOURCES_GEN)
-$(UNICODE_DATA_FILE):
-	wget --passive-ftp $(UNICODE_DATA_URL)
 
-$(SOURCES_GEN): $(UNICODE_DATA_FILE)
-	$(AWK_BIN) -f $(top_srcdir)/src/Unicode/unicodedata.awk $(UNICODE_DATA_FILE) >unicodedata.h
 
-UNICODE_CLEAN_FILES = $(SOURCES_GEN)
+########################################################################
+# If we have wget we will try to use it to "build" $(UNICODE_DATA_FILE).
+ifneq (,$(WGET_BIN))
+$(UNICODE_DATA_FILE):
+	$(WGET_BIN) --passive-ftp $(UNICODE_DATA_URL)
+else
+$(UNICODE_DATA_FILE):
+	@echo "You need to install a copy of $(UNICODE_DATA_URL) in this dir!"; \
+		echo "If configure finds 'wget' this can be done automatically."; \
+		exit 1
+endif
+# ^^^^ !WGET_BIN
+########################################################################
 
-ifneq (,$(wildcard $(UNICODE_DATA_FILE)))
-CLEAN_FILES += $(UNICODE_CLEAN_FILES)
-# we can afford this if we don't need to download the data file
+
+########################################################################
+# For dev tree allow clean and rebuild of gen'd files...
+ifeq (1,$(THIS_IS_A_DEV_TREE))
+CLEAN_FILES += $(SOURCES_UNICODE_GEN)
+$(SOURCES_UNICODE_GEN): $(UNICODE_DATA_FILE)
+	$(AWK_BIN) -f $(top_srcdir)/src/Unicode/unicodedata.awk $(UNICODE_DATA_FILE) >unicodedata.h
+else
+###### for "mere mortal" trees, use the shipped copies and don't delete them:
+$(SOURCES_UNICODE_GEN):
+	@true
 endif
+########################################################################
 
 
-STATIC_LIBS: $(SOURCES_GEN) 
+STATIC_LIBS: $(SOURCES_UNICODE_GEN) 
 SHARED_LIBS: STATIC_LIBS
 all: STATIC_LIBS SHARED_LIBS