From e6a41ccfbf428e98dfa6aa7fb976b3e6039be46f Mon Sep 17 00:00:00 2001 From: Ryan Lucia Date: Sun, 6 Oct 2019 20:52:52 -0400 Subject: [PATCH] autotools: remove remaining makefiles --- packages/desktop/Makefile | 26 ----- po/Makefile | 24 ----- src/Makefile | 213 -------------------------------------- src/libresrc/Makefile | 37 ------- tools/Makefile | 19 ---- 5 files changed, 319 deletions(-) delete mode 100644 packages/desktop/Makefile delete mode 100644 po/Makefile delete mode 100644 src/Makefile delete mode 100644 src/libresrc/Makefile delete mode 100644 tools/Makefile diff --git a/packages/desktop/Makefile b/packages/desktop/Makefile deleted file mode 100644 index 47a21a63a..000000000 --- a/packages/desktop/Makefile +++ /dev/null @@ -1,26 +0,0 @@ -include $(dir $(lastword $(MAKEFILE_LIST)))../../header.mk -DESKTOP_SRC := $(d) - -ICONS = $(sort $(wildcard $(d)*.png)) $(sort $(wildcard $(d)*.svg)) -ICONS_INSTALLED = $(DESTDIR)$(P_ICON)/hicolor/%/apps/aegisub. - -DESKTOP_FILE := $(d)aegisub.desktop -DESKTOP_FILE_PO := $(d)../../po -DESKTOP_FILE_INSTALLED = $(DESTDIR)$(P_DESKTOP)/$(notdir $(DESKTOP_FILE)) - -DISTCLEANFILES += $(DESKTOP_FILE) - -%.desktop: %.desktop.template $(DESKTOP_FILE_PO) - intltool-merge --quiet --desktop-style $(DESKTOP_FILE_PO) $< $@ - -$(ICONS_INSTALLED)png: $(d)%.png ; $(MKDIR_INSTALL) -$(ICONS_INSTALLED)svg: $(d)%.svg ; $(MKDIR_INSTALL) -$(DESKTOP_FILE_INSTALLED): $(DESKTOP_FILE) ; $(MKDIR_INSTALL) - -ifneq (yes, $(BUILD_DARWIN)) -install: \ - $(DESKTOP_FILE_INSTALLED) \ - $(patsubst %.png, $(ICONS_INSTALLED)png, $(patsubst %.svg, $(ICONS_INSTALLED)svg, $(notdir $(ICONS)))) -endif - -include $(TOP)Makefile.target diff --git a/po/Makefile b/po/Makefile deleted file mode 100644 index 4c7832b6a..000000000 --- a/po/Makefile +++ /dev/null @@ -1,24 +0,0 @@ -include $(dir $(lastword $(MAKEFILE_LIST)))../header.mk - -.SUFFIXES: .po .mo - -PO := $(wildcard $(d)*.po) -MO := $(PO:po=mo) - -ifeq (yes, $(BUILD_DARWIN)) -MO_INSTALLED = $(DESTDIR)$(P_LOCALE)/%.lproj/$(AEGISUB_CATALOG).mo -else -MO_INSTALLED = $(DESTDIR)$(P_LOCALE)/%/LC_MESSAGES/$(AEGISUB_CATALOG).mo -endif - -%.mo: %.po - $(BIN_MSGFMT) -o $@ $< - -$(MO_INSTALLED): $(d)%.mo ; $(MKDIR_INSTALL) - -all: $(MO) -install: $(patsubst %.mo, $(MO_INSTALLED), $(notdir $(MO))) - -CLEANFILES += $(MO) - -include $(TOP)Makefile.target diff --git a/src/Makefile b/src/Makefile deleted file mode 100644 index 1121e0f36..000000000 --- a/src/Makefile +++ /dev/null @@ -1,213 +0,0 @@ -include $(dir $(lastword $(MAKEFILE_LIST)))../header.mk - -PROGRAM += $(d)src - -src_CPPFLAGS := -I$(d) -I.. -I$(d)include -I$(TOP)libaegisub/include -I$(TOP)build \ - $(CFLAGS_PTHREAD) $(CFLAGS_FFTW3) $(CFLAGS_ICU) $(CPPFLAGS_BOOST) -src_CXXFLAGS := $(CXXFLAGS_WX) -src_LIBS := $(LIBS_GL) $(LIBS_PTHREAD) $(LIBS_WX) $(LIBS_FREETYPE) \ - $(LIBS_LIBASS) $(LIBS_FONTCONFIG) $(LIBS_FFTW3) $(LIBS_BOOST) $(LIBS_ICU) -src_PCH := $(d)agi_pre.h -src_INSTALLNAME := $(AEGISUB_COMMAND) - -src_OBJ := \ - $(patsubst %.cpp,%.o,$(sort $(wildcard $(d)command/*.cpp))) \ - $(patsubst %.cpp,%.o,$(sort $(wildcard $(d)dialog_*.cpp))) \ - $(patsubst %.cpp,%.o,$(sort $(wildcard $(d)subtitle_format*.cpp))) \ - $(patsubst %.cpp,%.o,$(sort $(wildcard $(d)visual_tool*.cpp))) \ - $(d)MatroskaParser.o \ - $(d)aegisublocale.o \ - $(d)ass_attachment.o \ - $(d)ass_dialogue.o \ - $(d)ass_entry.o \ - $(d)ass_export_filter.o \ - $(d)ass_exporter.o \ - $(d)ass_file.o \ - $(d)ass_karaoke.o \ - $(d)ass_override.o \ - $(d)ass_parser.o \ - $(d)ass_style.o \ - $(d)ass_style_storage.o \ - $(d)async_video_provider.o \ - $(d)audio_box.o \ - $(d)audio_colorscheme.o \ - $(d)audio_controller.o \ - $(d)audio_display.o \ - $(d)audio_karaoke.o \ - $(d)audio_marker.o \ - $(d)audio_player.o \ - $(d)audio_provider_factory.o \ - $(d)audio_renderer.o \ - $(d)audio_renderer_spectrum.o \ - $(d)audio_renderer_waveform.o \ - $(d)audio_timing_dialogue.o \ - $(d)audio_timing_karaoke.o \ - $(d)auto4_base.o \ - $(d)auto4_lua.o \ - $(d)auto4_lua_assfile.o \ - $(d)auto4_lua_dialog.o \ - $(d)auto4_lua_progresssink.o \ - $(d)avisynth_wrap.o \ - $(d)base_grid.o \ - $(d)charset_detect.o \ - $(d)colorspace.o \ - $(d)colour_button.o \ - $(d)compat.o \ - $(d)context.o \ - $(d)crash_writer.o \ - $(d)export_fixstyle.o \ - $(d)export_framerate.o \ - $(d)fft.o \ - $(d)font_file_lister.o \ - $(d)frame_main.o \ - $(d)gl_text.o \ - $(d)gl_wrap.o \ - $(d)grid_column.o \ - $(d)help_button.o \ - $(d)hotkey.o \ - $(d)hotkey_data_view_model.o \ - $(d)initial_line_state.o \ - $(d)main.o \ - $(d)menu.o \ - $(d)mkv_wrap.o \ - $(d)pen.o \ - $(d)persist_location.o \ - $(d)preferences.o \ - $(d)preferences_base.o \ - $(d)project.o \ - $(d)resolution_resampler.o \ - $(d)search_replace_engine.o \ - $(d)selection_controller.o \ - $(d)spellchecker.o \ - $(d)spline.o \ - $(d)spline_curve.o \ - $(d)string_codec.o \ - $(d)subs_controller.o \ - $(d)subs_edit_box.o \ - $(d)subs_edit_ctrl.o \ - $(d)subs_preview.o \ - $(d)subtitles_provider.o \ - $(d)subtitles_provider_libass.o \ - $(d)text_file_reader.o \ - $(d)text_file_writer.o \ - $(d)text_selection_controller.o \ - $(d)thesaurus.o \ - $(d)timeedit_ctrl.o \ - $(d)toggle_bitmap.o \ - $(d)toolbar.o \ - $(d)tooltip_manager.o \ - $(d)utils.o \ - $(d)validators.o \ - $(d)vector2d.o \ - $(d)version.o \ - $(d)video_box.o \ - $(d)video_controller.o \ - $(d)video_display.o \ - $(d)video_frame.o \ - $(d)video_out_gl.o \ - $(d)video_provider_cache.o \ - $(d)video_provider_dummy.o \ - $(d)video_provider_manager.o \ - $(d)video_provider_yuv4mpeg.o \ - $(d)video_slider.o \ - $(d)visual_feature.o \ - $(TOP)lib/libaegisub.a \ - $(TOP)lib/libluabins.a \ - $(TOP)lib/libresrc.a \ - -ifeq (no, $(SYSTEM_LUAJIT)) -src_OBJ += $(LIBS_LUA) -else -src_LIBS += $(LIBS_LUA) -endif - -ifeq (yes, $(BUILD_DARWIN)) -src_OBJ += $(d)font_file_lister_coretext.o -src_OBJ += $(patsubst %.mm,%.o,$(sort $(wildcard $(d)osx/*.mm))) -$(d)font_file_lister_coretext.o_FLAGS := -fobjc-arc -else -src_OBJ += $(d)font_file_lister_fontconfig.o -endif - -############### -# AUDIO PLAYERS -############### -$(d)audio_player_alsa.o_FLAGS := $(CFLAGS_ALSA) -$(d)audio_player_portaudio.o_FLAGS := $(CFLAGS_PORTAUDIO) -$(d)audio_player_pulse.o_FLAGS := $(CFLAGS_LIBPULSE) -$(d)audio_player_openal.o_FLAGS := $(CFLAGS_OPENAL) -$(d)audio_player_oss.o_FLAGS := $(CFLAGS_OSS) - -ifeq (yes, $(HAVE_ALSA)) -src_LIBS += $(LIBS_ALSA) -src_OBJ += $(d)audio_player_alsa.o -endif - -ifeq (yes, $(HAVE_PORTAUDIO)) -src_LIBS += $(LIBS_PORTAUDIO) -src_OBJ += $(d)audio_player_portaudio.o -endif - -ifeq (yes, $(HAVE_LIBPULSE)) -src_LIBS += $(LIBS_LIBPULSE) -src_OBJ += $(d)audio_player_pulse.o -endif - -ifeq (yes, $(HAVE_OPENAL)) -src_LIBS += $(LIBS_OPENAL) -src_OBJ += $(d)audio_player_openal.o -endif - -ifeq (yes, $(HAVE_OSS)) -src_OBJ += $(d)audio_player_oss.o -endif - -####################### -# AUDIO / VIDEO SUPPORT -####################### -ifeq (yes, $(HAVE_FFMS2)) -$(d)audio_provider_ffmpegsource.o_FLAGS := $(CFLAGS_FFMS2) -$(d)video_provider_ffmpegsource.o_FLAGS := $(CFLAGS_FFMS2) -$(d)ffmpegsource_common.o_FLAGS := $(CFLAGS_FFMS2) -$(d)preferences.o_FLAGS := $(CFLAGS_FFMS2) -src_LIBS += $(LIBS_FFMS2) -src_OBJ += \ - $(d)audio_provider_ffmpegsource.o \ - $(d)video_provider_ffmpegsource.o \ - $(d)ffmpegsource_common.o -endif - -############## -# MISCELLANOUS -############## -ifeq (yes, $(HAVE_HUNSPELL)) -$(d)spellchecker_hunspell.o_FLAGS := $(CFLAGS_HUNSPELL) -src_LIBS += $(LIBS_HUNSPELL) -src_OBJ += $(d)spellchecker_hunspell.o -endif - -ifeq (yes, $(HAVE_UCHARDET)) -src_LIBS += $(LIBS_UCHARDET) -endif - -##################### -# SOURCE-LEVEL CFLAGS -##################### -$(d)MatroskaParser.o_FLAGS := -Wno-sometimes-uninitialized -$(d)audio_player.o_FLAGS := $(CFLAGS_ALSA) $(CFLAGS_PORTAUDIO) $(CFLAGS_LIBPULSE) $(CFLAGS_OPENAL) -$(d)audio_provider_factory.o_FLAGS := $(CFLAGS_FFMS2) -$(d)auto4_base.o_FLAGS := $(CFLAGS_FREETYPE) -$(d)charset_detect.o_FLAGS := -D_X86_ -$(d)font_file_lister_fontconfig.o_FLAGS := $(CFLAGS_FONTCONFIG) -$(d)subtitles_provider.o_FLAGS := $(CFLAGS_LIBASS) -$(d)subtitles_provider_libass.o_FLAGS := $(CFLAGS_LIBASS) -Wno-c++11-narrowing -$(d)text_file_reader.o_FLAGS := -D_X86_ -$(d)video_provider_manager.o_FLAGS := $(CFLAGS_FFMS2) -$(d)auto4_lua.o_FLAGS := $(CFLAGS_LUA) -$(d)auto4_lua_assfile.o_FLAGS := $(CFLAGS_LUA) -$(d)auto4_lua_dialog.o_FLAGS := $(CFLAGS_LUA) -$(d)auto4_lua_progresssink.o_FLAGS := $(CFLAGS_LUA) - -$(src_OBJ): $(d)libresrc/bitmap.h $(d)libresrc/default_config.h - -include $(d)libresrc/Makefile diff --git a/src/libresrc/Makefile b/src/libresrc/Makefile deleted file mode 100644 index 8b6d19595..000000000 --- a/src/libresrc/Makefile +++ /dev/null @@ -1,37 +0,0 @@ -include $(dir $(lastword $(MAKEFILE_LIST)))../../header.mk - -LIB += resrc - -resrc_CPPFLAGS := -I$(TOP) -I$(d) $(CPPFLAGS_WX) -resrc_OBJ := \ - $(d)bitmap.o \ - $(d)default_config.o \ - $(d)libresrc.o - -$(resrc_OBJ): $(d)default_config.h $(d)bitmap.h $(d)default_config.cpp $(d)bitmap.cpp - -RESPACK := cd $(TOP)src/libresrc; $(BIN_LUA) $(TOP)tools/respack.lua - -$(d)bitmap.cpp: $(d)bitmap.h -$(d)default_config.cpp: $(d)default_config.h - -$(d)bitmap.h: $(TOP)tools/respack.lua $(d)../bitmaps/button - $(RESPACK) ../bitmaps/manifest.respack bitmap.cpp bitmap.h - -ifeq (yes, $(BUILD_DARWIN)) -$(d)default_config.h: $(TOP)tools/respack.lua $(d)*.json $(d)osx/*.json - $(RESPACK) manifest_osx.respack default_config.cpp default_config.h -else -$(d)default_config.h: $(TOP)tools/respack.lua $(d)*.json - $(RESPACK) manifest.respack default_config.cpp default_config.h -endif - -CLEANFILES += \ - $(d)bitmap.cpp \ - $(d)bitmap.h \ - $(d)default_config.cpp \ - $(d)default_config.h - -DISTCLEANFILES += $(d)default_config_platform.json - -include $(TOP)Makefile.target diff --git a/tools/Makefile b/tools/Makefile deleted file mode 100644 index e3d108a52..000000000 --- a/tools/Makefile +++ /dev/null @@ -1,19 +0,0 @@ -include $(dir $(lastword $(MAKEFILE_LIST)))../header.mk - -osx-bundle-restart-helper_OBJ := $(d)osx-bundle-restart-helper.o - -ifeq (yes, $(BUILD_DARWIN)) -PROGRAM += $(d)osx-bundle-restart-helper -endif - -repack-thes-dict_OBJ := $(d)repack-thes-dict.o $(TOP)lib/libaegisub.a -repack-thes-dict_LIBS := $(LIBS_BOOST) $(LIBS_ICU) $(LIBS_PTHREAD) -repack-thes-dict_CPPFLAGS := -I$(TOP) -I$(TOP)libaegisub/include $(CFLAGS_ICU) - -PROGRAM += $(d)repack-thes-dict - -ifeq (no, $(SYSTEM_LUAJIT)) -$(TOP)tools/respack.lua: $(BIN_LUA) -endif - -include $(TOP)Makefile.target