Updates for autotools' make dist

Rename ass_cache_template.c to ass_cache_template.h; add libass.sym to
EXTRA_DIST.

diff --git a/libass/Makefile.am b/libass/Makefile.am
index 4f84699564dc51af5a04baba8476b93f3ad369e9..e984ce10b1b1db605d4d73c315e570fe5507408d 100644 (file)
--- a/libass/Makefile.am
+++ b/libass/Makefile.am
@@ -7,10 +7,11 @@ libass_la_SOURCES = ass.c ass_cache.c ass_font.c ass_fontconfig.c ass_render.c \
                     ass_utils.c ass_bitmap.c ass_library.c ass_bitmap.h \
                     ass_cache.h ass_fontconfig.h ass_font.h ass.h \
                     ass_library.h ass_types.h ass_utils.h ass_drawing.c \
-                    ass_drawing.h
+                    ass_drawing.h ass_cache_template.h
 libass_la_LDFLAGS = -version-info $(LIBASS_LT_CURRENT):$(LIBASS_LT_REVISION):$(LIBASS_LT_AGE)
 libass_la_LDFLAGS += -export-symbols $(srcdir)/libass.sym
 
 assheadersdir = $(includedir)/ass
 dist_assheaders_HEADERS = ass.h ass_types.h
 
+EXTRA_DIST = libass.sym

diff --git a/libass/ass_cache.c b/libass/ass_cache.c
index ed44a2f1bf7fe8ed28663924a52b01622d0ce624..4c7a3fa537519bea6d424055333fe254aecf1096 100644 (file)
--- a/libass/ass_cache.c
+++ b/libass/ass_cache.c
@@ -199,9 +199,9 @@ void ass_font_cache_done(hashmap_t *font_cache)
 
 // Create hash/compare functions for bitmap and glyph
 #define CREATE_HASH_FUNCTIONS
-#include "ass_cache_template.c"
+#include "ass_cache_template.h"
 #define CREATE_COMPARISON_FUNCTIONS
-#include "ass_cache_template.c"
+#include "ass_cache_template.h"
 
 //---------------------------------
 // bitmap cache

diff --git a/libass/ass_cache.h b/libass/ass_cache.h
index 004a4b67c0594eb83222991c7dc3c686a46e4a04..83c994386546c163bf525ad457d982dedd641b70 100644 (file)
--- a/libass/ass_cache.h
+++ b/libass/ass_cache.h
@@ -68,7 +68,7 @@ void ass_font_cache_done(hashmap_t *);
 
 // Create definitions for bitmap_hash_key and glyph_hash_key
 #define CREATE_STRUCT_DEFINITIONS
-#include "ass_cache_template.c"
+#include "ass_cache_template.h"
 
 typedef struct bitmap_hash_val_s {
     bitmap_t *bm;               // the actual bitmaps

diff --git a/libass/ass_cache_template.c b/libass/ass_cache_template.h
similarity index 100%
rename from libass/ass_cache_template.c
rename to libass/ass_cache_template.h