[pclasses-cvs] pclasses2/src/Unicode Makefile.toc,1.2,1.3

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

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

Modified Files:
	Makefile.toc 
Log Message:
More build fixes. unicode*.h are now generated.

Index: Makefile.toc
===================================================================
RCS file: /cvsroot/pclasses/pclasses2/src/Unicode/Makefile.toc,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- Makefile.toc	23 Dec 2004 05:51:43 -0000	1.2
+++ Makefile.toc	23 Dec 2004 06:05:26 -0000	1.3
@@ -5,17 +5,20 @@
 	String.cpp \
 	TextStream.cpp
 
-
-DIST_FILES += $(SOURCES) $(HEADERS)
+SOURCES_GEN = unicodedata.h unicodedata_extra.h
 
 OBJECTS = Char.o \
 	String.o \
 	TextStream.o
+$(OBJECTS): $(SOURCES_GEN)
+
+
+DIST_FILES += $(SOURCES)
 
 CLEAN_FILES += $(OBJECTS)
 
 build_libs = 1
-LIBNAME = punicode
+LIBNAME = libpunicode
 ifeq (1,$(build_libs))
   STATIC_LIBS = $(LIBNAME)
   SHARED_LIBS = $(STATIC_LIBS)
@@ -27,25 +30,24 @@
   # Run targets STATIC_LIBS and SHARED_LIBS build these.
 endif
 
-SOURCES_GEN = unicodedata.h unicodedata_extra.h
 UNICODE_DATA_FILE = UnicodeData.txt
 UNICODE_DATA_URL = http://www.unicode.org/Public/UNIDATA/$(UNICODE_DATA_FILE)
 INSTALL_HEADERS = $(SOURCES_GEN)
-$(SOURCES_GEN):
-	test -f $(UNICODE_DATA_FILE) || wget --passive-ftp $(UNICODE_DATA_URL)
-	$(AWK_BIN) -f $(top_srcdir)/src/Unicode/unicodedata.awk $(UNICODE_DATA_FILE) >unicodedata.h
+$(UNICODE_DATA_FILE):
+	wget --passive-ftp $(UNICODE_DATA_URL)
 
-UNICODE_CLEAN_FILES = $(UNICODE_DATA_FILE) $(SOURCES_GEN)
+$(SOURCES_GEN): $(UNICODE_DATA_FILE)
+	$(AWK_BIN) -f $(top_srcdir)/src/Unicode/unicodedata.awk $(UNICODE_DATA_FILE) >unicodedata.h
 
-clean-unicode:
-	$(call toc_clean_files $(UNICODE_CLEAN_FILES))
+UNICODE_CLEAN_FILES = $(SOURCES_GEN)
 
-ifeq (,$(wildcard $(UNICODE_DATA_FILE)))
+ifneq (,$(wildcard $(UNICODE_DATA_FILE)))
+CLEAN_FILES += $(UNICODE_CLEAN_FILES)
 # we can afford this if we don't need to download the data file
-clean: clean-unicode
 endif
 
 
-# distclean: clean-unicode
-
+STATIC_LIBS: $(SOURCES_GEN) 
+SHARED_LIBS: STATIC_LIBS
 all: STATIC_LIBS SHARED_LIBS
+