Update distdir generation

The list of files to include was out of date and only included files
for dependencies which were actually enabled, and the script was
FreeBSD-specific.

Originally committed to SVN as r6298.
This commit is contained in:
Thomas Goyne 2012-01-14 18:46:43 +00:00
parent a586e7e58f
commit 3ed84ba70d
9 changed files with 81 additions and 49 deletions

View file

@ -39,6 +39,8 @@ EXTRA_DIST = \
configure \
svn_revision \
config.log \
config.sub \
config.guess \
install-sh \
Makefile.inc.in \
Makefile.target
@ -46,13 +48,14 @@ EXTRA_DIST = \
# m4macros/
EXTRA_DIST += \
m4macros/check_gnu_make.m4 \
m4macros/acx_pthread.m4 \
m4macros/ac_agi.m4 \
m4macros/ax_lang_compiler_ms.m4 \
m4macros/ac_agi_mdcpucfg.m4 \
m4macros/ac_flag.m4 \
m4macros/agi_find_libheader.m4 \
m4macros/ax_check_gl.m4 \
m4macros/ac_flag.m4
m4macros/ax_lang_compiler_ms.m4 \
m4macros/ax_pthread.m4 \
m4macros/check_gnu_make.m4
# packages/osx_bundle/
EXTRA_DIST += \

View file

@ -113,10 +113,10 @@ distdir:
echo "Please run this from the parent directory."; \
exit 1; \
fi
${SHELL} packages/distfile/distfile.sh
${SHELL} packages/distfile/distfile.sh $(MAKE) aegisub-pkg
distfiles: $(SUBDIRS)
@for i in $(SRC) $(HEADER) $(EXTRA_DIST); do \
@for i in $(SRC) $(HEADER) $(PO) $(EXTRA_DIST); do \
echo $(CURDIR)/$$i; \
done

View file

@ -7,6 +7,8 @@ DATA_AUTOMATION += \
autoload/karaoke-auto-leadin.lua \
autoload/macro-1-edgeblur.lua \
autoload/macro-2-mkfullwitdh.lua \
autoload/select-overlaps.lua \
autoload/strip-tags.lua \
include/cleantags.lua \
include/karaskel-auto4.lua \
include/karaskel.lua \

View file

@ -19,7 +19,7 @@ endif
common/charset_conv.o: CXXFLAGS += $(CFLAGS_ICONV)
unix/path.o: CXXFLAGS += -DP_DATA=\"$(P_DATA)\" -DP_DOC=\"$(P_DOC)\" -DP_LOCALE=\"$(P_LOCALE)\"
SRC = \
SRC += \
common/cajun/elements.cpp \
common/cajun/reader.cpp \
common/cajun/writer.cpp \
@ -49,10 +49,14 @@ SRC += \
osx/util.cpp
endif
HEADERS = \
HEADER += \
*.h \
*/*.h \
include/aegisub/*.h \
include/aegisub/cajun/*.h
include/libaegisub/*.h \
include/libaegisub/charsets.def \
include/libaegisub/cajun/*.h
EXTRA_DIST += osx/util.cpp
include ../Makefile.target

View file

@ -1,26 +1,22 @@
#!/bin/sh
SRCDIR=`pwd`
TMPFILE=`mktemp /tmp/aegisub_dist.XXXXXX`
EXTRA=`find . -name Makefile -or -name wscript`
distdir?=aegisub-pkg
MAKE=$1
DISTDIR=$2
rm -rf aegisub-pkg
rm -rf $DISTDIR
if ! test -d src; then
echo "Please run this from the parent directory.";
exit 1;
fi
gmake distfiles \
|egrep ^/ |sed "s|${SRCDIR}/||" \
|awk '{print "echo \"aegisub-pkg/"$0"\"\n./install-sh -m 0644 \""$0"\" \"aegisub-pkg/"$0"\""}' \
> ${TMPFILE}
$MAKE distfiles \
| grep -E ^/ \
| sed "s|${SRCDIR}/||" \
| xargs -I {} ./install-sh -m 0644 "{}" "$DISTDIR/{}"
for i in ${EXTRA}; do
echo "aegisub-pkg/$i";
./install-sh -m 0644 $i ${distdir}/$i;
for i in `find . -name Makefile -or -name wscript`; do
./install-sh -m 0644 "$i" "${DISTDIR}/$i"
done
sh ${TMPFILE}
#rm ${TMPFILE}
chmod +x ${DISTDIR}/configure

View file

@ -25,17 +25,22 @@ SRC = \
ifeq (yes, $(BUILD_BSD))
SRC += platform_unix_bsd.cpp
else
EXTRA_DIST += platform_unix_bsd.cpp
endif
ifeq (yes, $(BUILD_LINUX))
SRC += platform_unix_linux.cpp
else
EXTRA_DIST += platform_unix_linux.cpp
endif
ifeq (yes, $(BUILD_DARWIN))
SRC += platform_unix_osx.cpp
else
EXTRA_DIST += platform_unix_osx.cpp
endif
HEADER = \
*.h \
include/*.h

View file

@ -26,69 +26,87 @@ endif
# AUDIO PLAYERS
###############
ifeq (yes, $(HAVE_ALSA))
SRC_OPT += audio_player_alsa.cpp
audio_player_alsa.o: CXXFLAGS += $(CFLAGS_ALSA)
LIBS += $(LIBS_ALSA)
SRC += audio_player_alsa.cpp
else
EXTRA_DIST += audio_player_alsa.cpp
endif
ifeq (yes, $(HAVE_PORTAUDIO))
SRC_OPT += audio_player_portaudio.cpp
audio_player_portaudio.o: CXXFLAGS += $(CFLAGS_PORTAUDIO)
LIBS += $(LIBS_PORTAUDIO)
SRC += audio_player_portaudio.cpp
else
EXTRA_DIST += audio_player_portaudio.cpp
endif
ifeq (yes, $(HAVE_LIBPULSE))
SRC_OPT += audio_player_pulse.cpp
audio_player_pulse.o: CXXFLAGS += $(CFLAGS_LIBPULSE)
LIBS += $(LIBS_LIBPULSE)
SRC += audio_player_pulse.cpp
else
EXTRA_DIST += audio_player_pulse.cpp
endif
ifeq (yes, $(HAVE_OPENAL))
SRC_OPT += audio_player_openal.cpp
audio_player_openal.o: CXXFLAGS += $(CFLAGS_OPENAL)
LIBS += $(LIBS_OPENAL)
SRC += audio_player_openal.cpp
else
EXTRA_DIST += audio_player_openal.cpp
endif
ifeq (yes, $(HAVE_OSS))
SRC_OPT += audio_player_oss.cpp
audio_player_oss.o: CXXFLAGS += $(CFLAGS_OSS)
SRC += audio_player_oss.cpp
else
EXTRA_DIST += audio_player_oss.cpp
endif
#######################
# AUDIO / VIDEO SUPPORT
#######################
ifeq (yes, $(HAVE_FFMS2))
SRC_OPT += audio_provider_ffmpegsource.cpp video_provider_ffmpegsource.cpp ffmpegsource_common.cpp
audio_provider_ffmpegsource.o video_provider_ffmpegsource.o ffmpegsource_common.o: \
CXXFLAGS += $(CFLAGS_FFMS2)
LIBS += $(LIBS_FFMS2)
SRC += audio_provider_ffmpegsource.cpp video_provider_ffmpegsource.cpp ffmpegsource_common.cpp
else
EXTRA_DIST += audio_provider_ffmpegsource.cpp video_provider_ffmpegsource.cpp ffmpegsource_common.cpp
endif
###########
# SUBTITLES
###########
ifeq (yes, $(HAVE_LIBASS))
SRC_OPT += subtitles_provider_libass.cpp
subtitles_provider_libass.o: CXXFLAGS += $(CFLAGS_LIBASS)
LIBS += $(LIBS_LIBASS)
SRC += subtitles_provider_libass.cpp
else
EXTRA_DIST += subtitles_provider_libass.cpp
endif
############
# AUTOMATION
############
ifeq (yes, $(HAVE_AUTO4_LUA))
SRC_OPT += auto4_lua.cpp auto4_lua_assfile.cpp auto4_lua_dialog.cpp auto4_lua_progresssink.cpp auto4_lua_scriptreader.cpp
auto4_lua.o auto4_lua_assfile.o auto4_lua_dialog.o auto4_lua_progresssink.o auto4_lua_scriptreader.o: CXXFLAGS += $(CFLAGS_LUA)
LIBS += $(LIBS_LUA)
SRC += auto4_lua.cpp auto4_lua_assfile.cpp auto4_lua_dialog.cpp auto4_lua_progresssink.cpp auto4_lua_scriptreader.cpp
else
EXTRA_DIST += auto4_lua.cpp auto4_lua_assfile.cpp auto4_lua_dialog.cpp auto4_lua_progresssink.cpp auto4_lua_scriptreader.cpp
endif
##############
# MISCELLANOUS
##############
ifeq (yes, $(HAVE_HUNSPELL))
SRC_OPT += spellchecker_hunspell.cpp
spellchecker_hunspell.o: CXXFLAGS += $(CFLAGS_HUNSPELL)
LIBS += $(LIBS_HUNSPELL)
SRC += spellchecker_hunspell.cpp
else
EXTRA_DIST += spellchecker_hunspell.cpp
endif
#####################
@ -102,10 +120,6 @@ font_file_lister_fontconfig.o: CXXFLAGS += $(CFLAGS_FONTCONFIG)
text_file_reader.o: CXXFLAGS += -D_X86_
video_provider_manager.o: CXXFLAGS += $(CFLAGS_FFMS2)
# Ensure any optional source files above are added for compilation.
SRC += $(SRC_OPT)
SRC += \
MatroskaParser.c \
aegisublocale.cpp \
@ -252,23 +266,26 @@ SRC += \
HEADER += \
*.h \
command/*.h \
config/*.h \
include/aegisub/*.h \
config/*.h
gl/*.h
EXTRA_DIST = \
$(SRC_OPT) \
*.hxx
EXTRA_DIST= \
bitmaps/16/*.png \
bitmaps/24/*.png \
EXTRA_DIST += \
bitmaps/button/*.png \
bitmaps/misc/*.png \
bitmaps/windows/eyedropper.cur \
bitmaps/windows/icon.ico
bitmaps/windows/icon.ico \
bitmaps/*.respack
EXTRA_DIST += \
command/Makefile.inc \
libresrc/Makefile.inc
include command/Makefile.inc
include libresrc/Makefile.inc
include ../Makefile.target
-include *.d
-include command/*.d
-include libresrc/*.d

View file

@ -18,4 +18,8 @@ CLEANFILES += \
libresrc/default_config.cpp \
libresrc/default_config.h
GLOBAL_DEPS = libresrc/bitmap.h libresrc/default_config.h
GLOBAL_DEPS += libresrc/bitmap.h libresrc/default_config.h
EXTRA_DIST += \
libresrc/*.json \
libresrc/*.respack

View file

@ -13,6 +13,7 @@ endif
EXTRA_DIST = \
osx-bundle-restart-helper.c \
osx-bundle.sh \
osx-bundle.sed.in \
osx-dmg.sh \
osx-fix-libs.py