Remove all distfile stuff from the build system
It's unused and out of date.
This commit is contained in:
Thomas Goyne
parent
168cb8d7ef
commit
6500b379bd
12 changed files with 16 additions and 208 deletions
44
Makefile
44
Makefile
|
|
@ -22,50 +22,6 @@ osx-dmg: osx-bundle
|
|||
$(BIN_SHELL) tools/osx-dmg.sh "$(BUILD_VERSION_STRING)"
|
||||
endif
|
||||
|
||||
|
||||
EXTRA_DIST = \
|
||||
INSTALL \
|
||||
LICENCE \
|
||||
README \
|
||||
acinclude.m4 \
|
||||
autogen.sh \
|
||||
configure.in \
|
||||
acconf.h.in\
|
||||
configure \
|
||||
build/git_version.h \
|
||||
config.log \
|
||||
config.sub \
|
||||
config.guess \
|
||||
install-sh \
|
||||
Makefile.inc.in \
|
||||
Makefile.target
|
||||
|
||||
|
||||
# m4macros/
|
||||
EXTRA_DIST += \
|
||||
m4macros/ac_agi.m4 \
|
||||
m4macros/ac_agi_mdcpucfg.m4 \
|
||||
m4macros/ac_flag.m4 \
|
||||
m4macros/agi_find_libheader.m4 \
|
||||
m4macros/ax_check_gl.m4 \
|
||||
m4macros/ax_lang_compiler_ms.m4 \
|
||||
m4macros/ax_pthread.m4 \
|
||||
m4macros/check_gnu_make.m4
|
||||
|
||||
# packages/osx_bundle/
|
||||
EXTRA_DIST += \
|
||||
packages/osx_bundle/Contents/Info.plist \
|
||||
packages/osx_bundle/Contents/Resources/*.icns \
|
||||
packages/osx_bundle/Contents/Resources/etc/fonts/fonts.conf \
|
||||
packages/osx_bundle/Contents/Resources/etc/fonts/fonts.dtd \
|
||||
packages/osx_bundle/Contents/Resources/etc/fonts/conf.d/*.conf
|
||||
|
||||
# packages/osx_dmg/
|
||||
EXTRA_DIST += \
|
||||
packages/osx_dmg/dmg_background.png \
|
||||
packages/osx_dmg/dmg_set_style.applescript
|
||||
|
||||
|
||||
DISTCLEANFILES += \
|
||||
acconf.h \
|
||||
configure \
|
||||
|
|
|
|||
|
|
@ -110,26 +110,6 @@ ifdef DATA_SHARE_DOC
|
|||
done
|
||||
endif
|
||||
|
||||
##############
|
||||
# DISTRIBUTION
|
||||
##############
|
||||
dist: distdir
|
||||
@$(BIN_TAR) chf - --posix "$(PACKAGE_TARNAME)" | $(BIN_GZIP) -c > "$(PACKAGE_TARNAME).tar.gz"
|
||||
@rm -rf $(PACKAGE_TARNAME)
|
||||
|
||||
distdir:
|
||||
@if ! test -f packages/distfile/distfile.sh; then \
|
||||
echo "Please run this from the parent directory."; \
|
||||
exit 1; \
|
||||
fi
|
||||
@${SHELL} packages/distfile/distfile.sh $(MAKE) $(PACKAGE_TARNAME)
|
||||
|
||||
distfiles: $(SUBDIRS)
|
||||
@for i in $(SRC) $(HEADER) $(PO) $(EXTRA_DIST); do \
|
||||
echo $(CURDIR)/$$i; \
|
||||
done
|
||||
|
||||
|
||||
########################
|
||||
# SUBDIRECTORY TRAVERSAL
|
||||
########################
|
||||
|
|
@ -143,7 +123,6 @@ automation: libaegisub vendor/luajit
|
|||
src: vendor/universalchardet vendor/luajit tools libaegisub
|
||||
tests: libaegisub
|
||||
tools: libaegisub
|
||||
reporter: src
|
||||
|
||||
$(OBJ): $(GLOBAL_DEPS)
|
||||
|
||||
|
|
|
|||
|
|
@ -52,7 +52,5 @@ install: install-share
|
|||
$(BIN_INSTALL) -m644 $$i $(DESTDIR)$(P_DATA)/automation/$$i; \
|
||||
done
|
||||
|
||||
EXTRA_DIST = $(DATA_AUTOMATION)
|
||||
|
||||
include ../Makefile.target
|
||||
-include tests/*.d
|
||||
|
|
|
|||
|
|
@ -61,15 +61,6 @@ else
|
|||
SRC += common/dispatch.cpp
|
||||
endif
|
||||
|
||||
HEADER += \
|
||||
*.h \
|
||||
*/*.h \
|
||||
include/libaegisub/*.h \
|
||||
include/libaegisub/charsets.def \
|
||||
include/libaegisub/cajun/*.h
|
||||
|
||||
EXTRA_DIST += osx/util.mm
|
||||
|
||||
include ../Makefile.target
|
||||
-include */*.d
|
||||
-include lua/*/*.d
|
||||
|
|
|
|||
|
|
@ -24,12 +24,6 @@ ICON_SCALABLE = \
|
|||
|
||||
DESKTOP_FILE = aegisub.desktop
|
||||
|
||||
EXTRA_DIST = \
|
||||
aegisub.desktop.template.in \
|
||||
aegisub.desktop.template \
|
||||
$(ICON_HICOLOR) \
|
||||
$(ICON_SCALABLE)
|
||||
|
||||
install: install-desktop install-icons
|
||||
|
||||
install-desktop: $(DESKTOP_FILE)
|
||||
|
|
|
|||
|
|
@ -1,22 +0,0 @@
|
|||
#!/bin/sh
|
||||
SRCDIR=`pwd`
|
||||
MAKE=$1
|
||||
DISTDIR=$2
|
||||
|
||||
rm -rf $DISTDIR
|
||||
|
||||
if ! test -d src; then
|
||||
echo "Please run this from the parent directory.";
|
||||
exit 1;
|
||||
fi
|
||||
|
||||
$MAKE distfiles \
|
||||
| grep -E ^/ \
|
||||
| sed "s|${SRCDIR}/||" \
|
||||
| xargs -I {} ./install-sh -m 0644 "{}" "$DISTDIR/{}"
|
||||
|
||||
for i in `find . -name Makefile -or -name wscript`; do
|
||||
./install-sh -m 0644 "$i" "${DISTDIR}/$i"
|
||||
done
|
||||
|
||||
chmod +x ${DISTDIR}/configure
|
||||
49
src/Makefile
49
src/Makefile
|
|
@ -29,39 +29,29 @@ ifeq (yes, $(HAVE_ALSA))
|
|||
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))
|
||||
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))
|
||||
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))
|
||||
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))
|
||||
audio_player_oss.o: CXXFLAGS += $(CFLAGS_OSS)
|
||||
SRC += audio_player_oss.cpp
|
||||
else
|
||||
EXTRA_DIST += audio_player_oss.cpp
|
||||
endif
|
||||
|
||||
#######################
|
||||
|
|
@ -72,8 +62,6 @@ audio_provider_ffmpegsource.o video_provider_ffmpegsource.o ffmpegsource_common.
|
|||
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
|
||||
|
||||
###########
|
||||
|
|
@ -91,8 +79,6 @@ ifeq (yes, $(HAVE_HUNSPELL))
|
|||
spellchecker_hunspell.o: CXXFLAGS += $(CFLAGS_HUNSPELL)
|
||||
LIBS += $(LIBS_HUNSPELL)
|
||||
SRC += spellchecker_hunspell.cpp
|
||||
else
|
||||
EXTRA_DIST += spellchecker_hunspell.cpp
|
||||
endif
|
||||
|
||||
#####################
|
||||
|
|
@ -152,6 +138,21 @@ SRC += \
|
|||
charset_detect.cpp \
|
||||
colorspace.cpp \
|
||||
colour_button.cpp \
|
||||
command/app.cpp \
|
||||
command/audio.cpp \
|
||||
command/automation.cpp \
|
||||
command/command.cpp \
|
||||
command/edit.cpp \
|
||||
command/grid.cpp \
|
||||
command/help.cpp \
|
||||
command/keyframe.cpp \
|
||||
command/recent.cpp \
|
||||
command/subtitle.cpp \
|
||||
command/time.cpp \
|
||||
command/timecode.cpp \
|
||||
command/tool.cpp \
|
||||
command/video.cpp \
|
||||
command/vis_tool.cpp \
|
||||
compat.cpp \
|
||||
context.cpp \
|
||||
crash_writer.cpp \
|
||||
|
|
@ -262,26 +263,6 @@ SRC += \
|
|||
visual_tool_scale.cpp \
|
||||
visual_tool_vector_clip.cpp
|
||||
|
||||
|
||||
HEADER += \
|
||||
*.h \
|
||||
command/*.h \
|
||||
config/*.h \
|
||||
include/aegisub/*.h \
|
||||
gl/*.h
|
||||
|
||||
EXTRA_DIST += \
|
||||
bitmaps/button/*.png \
|
||||
bitmaps/misc/*.png \
|
||||
bitmaps/windows/eyedropper.cur \
|
||||
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
|
||||
|
|
|
|||
|
|
@ -1,20 +0,0 @@
|
|||
SRC += \
|
||||
command/app.cpp \
|
||||
command/audio.cpp \
|
||||
command/automation.cpp \
|
||||
command/edit.cpp \
|
||||
command/grid.cpp \
|
||||
command/help.cpp \
|
||||
command/keyframe.cpp \
|
||||
command/recent.cpp \
|
||||
command/subtitle.cpp \
|
||||
command/time.cpp \
|
||||
command/timecode.cpp \
|
||||
command/tool.cpp \
|
||||
command/video.cpp \
|
||||
command/vis_tool.cpp
|
||||
|
||||
SRC += \
|
||||
command/command.cpp
|
||||
|
||||
HEADER += *.h
|
||||
|
|
@ -3,9 +3,6 @@ SRC += \
|
|||
libresrc/default_config.cpp \
|
||||
libresrc/libresrc.cpp
|
||||
|
||||
HEADER += \
|
||||
libresrc/libresrc.h
|
||||
|
||||
libresrc/bitmap.cpp libresrc/bitmap.h: ../tools/respack.lua bitmaps/button/*
|
||||
../tools/respack.lua bitmaps/manifest.respack libresrc/bitmap.cpp libresrc/bitmap.h
|
||||
|
||||
|
|
@ -27,6 +24,3 @@ DISTCLEANFILES += default_config_platform.json
|
|||
|
||||
GLOBAL_DEPS += libresrc/bitmap.h libresrc/default_config.h
|
||||
|
||||
EXTRA_DIST += \
|
||||
libresrc/*.json \
|
||||
libresrc/*.respack
|
||||
|
|
|
|||
|
|
@ -8,20 +8,9 @@ all: osx-bundle-restart-helper
|
|||
endif
|
||||
|
||||
CXXFLAGS += -I../libaegisub/include $(CFLAGS_ICU)
|
||||
LIBS := -L../libaegisub -laegisub $(LIBS)
|
||||
LIBS += $(LIBS_BOOST) $(LIBS_ICU)
|
||||
LIBS := -L../libaegisub -laegisub $(LIBS) $(LIBS_BOOST) $(LIBS_ICU)
|
||||
|
||||
repack-thes-dict: repack-thes-dict.cpp
|
||||
$(BIN_CXX) -o repack-thes-dict repack-thes-dict.cpp $(CXXFLAGS) $(LIBS)
|
||||
|
||||
EXTRA_DIST = \
|
||||
osx-bundle-restart-helper.c \
|
||||
osx-bundle.sh \
|
||||
osx-bundle.sed.in \
|
||||
osx-dmg.sh \
|
||||
osx-fix-libs.py
|
||||
|
||||
DISTCLEANFILES= \
|
||||
osx-bundle.sed
|
||||
|
||||
include ../Makefile.target
|
||||
|
|
|
|||
23
vendor/luabins/Makefile
vendored
23
vendor/luabins/Makefile
vendored
|
|
@ -13,28 +13,5 @@ SRC = \
|
|||
src/savebuffer.c \
|
||||
src/write.c
|
||||
|
||||
HEADER = \
|
||||
src/fwrite.h \
|
||||
src/luabins.h \
|
||||
src/luaheaders.h \
|
||||
src/luainternals.h \
|
||||
src/savebuffer.h \
|
||||
src/saveload.h \
|
||||
src/write.h
|
||||
|
||||
EXTRA_DIST = \
|
||||
src/lualess.c \
|
||||
src/lualess.h \
|
||||
etc/benchmark.lua \
|
||||
etc/checkfmt.lua \
|
||||
etc/dataset.lua \
|
||||
etc/tolua.lua \
|
||||
etc/toluabins.lua \
|
||||
AUTHORS \
|
||||
COPYRIGHT \
|
||||
HISTORY \
|
||||
README.md \
|
||||
TODO
|
||||
|
||||
include ../../Makefile.target
|
||||
-include src/*.d
|
||||
|
|
|
|||
9
vendor/universalchardet/Makefile
vendored
9
vendor/universalchardet/Makefile
vendored
|
|
@ -31,15 +31,6 @@ SRC = \
|
|||
nsUTF8Prober.cpp \
|
||||
nsUniversalDetector.cpp
|
||||
|
||||
HEADER = *.h
|
||||
|
||||
EXTRA_DIST = \
|
||||
Big5Freq.tab \
|
||||
EUCKRFreq.tab \
|
||||
EUCTWFreq.tab \
|
||||
GB2312Freq.tab \
|
||||
JISFreq.tab
|
||||
|
||||
include ../../Makefile.target
|
||||
-include *.d
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue