notgne2/tuxpaint-pencil-sharpener
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge /u/rndxelement/tuxpaint/ branch master into master

Browse source 
https://sourceforge.net/p/tuxpaint/tuxpaint/merge-requests/15/
This commit is contained in:
b'William Kendrick 2023-01-02 19:38:22 +00:00
commit cbc9bcbb97
2 changed files with 13 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

18
Makefile
View file

@ -454,7 +454,7 @@ INSTALLED_MODIRS:=$(patsubst trans/%.mo,$(LOCALE_PREFIX)/%/LC_MESSAGES,$(MOFILES
$(INSTALLED_MODIRS): $(LOCALE_PREFIX)/%/LC_MESSAGES: trans/%.mo $(INSTALLED_MODIRS): $(LOCALE_PREFIX)/%/LC_MESSAGES: trans/%.mo
install -d -m 755 $@ install -d -m 755 $@
$(INSTALLED_MOFILES): $(LOCALE_PREFIX)/%/LC_MESSAGES/tuxpaint.mo: trans/%.mo $(INSTALLED_MOFILES): $(LOCALE_PREFIX)/%/LC_MESSAGES/tuxpaint.mo: trans/%.mo $(INSTALLED_MODIRS)
install -m 644 $< $@ install -m 644 $< $@
.PHONY: uninstall-i18n .PHONY: uninstall-i18n
@ -533,9 +533,9 @@ endif
# Build the translation files for gettext # Build the translation files for gettext
$(MOFILES): trans/%.mo: src/po/%.po $(MOFILES): trans/%.mo: src/po/%.po trans
msgfmt -o $@ $< msgfmt -o $@ $<
k
%.desktop: %.desktop.in $(POTFILES) %.desktop: %.desktop.in $(POTFILES)
msgfmt --desktop -d src/po --template $< -o $@ msgfmt --desktop -d src/po --template $< -o $@
@ -654,7 +654,7 @@ install-magic-plugins:
$(DATA_PREFIX)/sounds/magic/*.ogg $(DATA_PREFIX)/sounds/magic/*.ogg
.PHONY: install-magic-plugins .PHONY: install-magic-plugins
install-magic-plugin-dev: src/tp_magic_api.h install-magic-plugin-dev: src/tp_magic_api.h install-bin
@echo @echo
@echo "...Installing Magic Tool plug-in development files and docs..." @echo "...Installing Magic Tool plug-in development files and docs..."
@cp tp-magic-config $(BIN_PREFIX) @cp tp-magic-config $(BIN_PREFIX)
@ -810,7 +810,7 @@ install-example-stamps:
STARTERS:=$(wildcard starters/*.*) STARTERS:=$(wildcard starters/*.*)
INSTALLED_STARTERS:=$(patsubst %,$(DATA_PREFIX)/%,$(STARTERS)) INSTALLED_STARTERS:=$(patsubst %,$(DATA_PREFIX)/%,$(STARTERS))
$(INSTALLED_STARTERS): $(DATA_PREFIX)/%: % $(INSTALLED_STARTERS): $(DATA_PREFIX)/%: % install-example-starters-dirs
install -m 644 $< $@ install -m 644 $< $@
install-example-starters-dirs: install-example-starters-dirs:
@ -851,7 +851,7 @@ $(THUMB_STARTERS):
convert $(CONVERT_OPTS) $(STARTER_NAME) $@ 2> /dev/null || ( echo "($@ failed)" ; rm $@ ) ; \ convert $(CONVERT_OPTS) $(STARTER_NAME) $@ 2> /dev/null || ( echo "($@ failed)" ; rm $@ ) ; \
fi fi
$(INSTALLED_THUMB_STARTERS): $(DATA_PREFIX)/%: % $(INSTALLED_THUMB_STARTERS): $(DATA_PREFIX)/%: % install-example-starters-dirs
@install -D -m 644 $< $@ || ( echo "NO THUMB $<" ) @install -D -m 644 $< $@ || ( echo "NO THUMB $<" )
.PHONY: echo-thumb-starters .PHONY: echo-thumb-starters
@ -876,7 +876,7 @@ install-thumb-starters: echo-install-thumb-starters $(INSTALLED_THUMB_STARTERS)
TEMPLATES:=$(wildcard templates/*.*) TEMPLATES:=$(wildcard templates/*.*)
INSTALLED_TEMPLATES:=$(patsubst %,$(DATA_PREFIX)/%,$(TEMPLATES)) INSTALLED_TEMPLATES:=$(patsubst %,$(DATA_PREFIX)/%,$(TEMPLATES))
$(INSTALLED_TEMPLATES): $(DATA_PREFIX)/%: % $(INSTALLED_TEMPLATES): $(DATA_PREFIX)/%: % install-example-template-dirs
install -m 644 $< $@ install -m 644 $< $@
install-example-template-dirs: install-example-template-dirs:
@ -1027,7 +1027,7 @@ install-haiku:
# Install the import script: # Install the import script:
.PHONY: install-importscript .PHONY: install-importscript
install-importscript: install-importscript: install-bin
@echo @echo
@echo "...Installing 'tuxpaint-import' script..." @echo "...Installing 'tuxpaint-import' script..."
@cp src/tuxpaint-import.sh $(BIN_PREFIX)/tuxpaint-import @cp src/tuxpaint-import.sh $(BIN_PREFIX)/tuxpaint-import
@ -1410,7 +1410,7 @@ SHARED_FLAGS:=-shared -fpic -lm
MAGIC_C:=$(wildcard magic/src/*.c) MAGIC_C:=$(wildcard magic/src/*.c)
MAGIC_SO:=$(patsubst magic/src/%.c,magic/%.$(SO_TYPE),$(MAGIC_C)) MAGIC_SO:=$(patsubst magic/src/%.c,magic/%.$(SO_TYPE),$(MAGIC_C))
$(MAGIC_SO): magic/%.$(SO_TYPE): magic/src/%.c $(MAGIC_SO): magic/%.$(SO_TYPE): magic/src/%.c src/tp_magic_api.h
$(CC) $(MAGIC_CFLAGS) $(LDFLAGS) $(SHARED_FLAGS) -o $@ $< $(PLUGIN_LIBS) $(CC) $(MAGIC_CFLAGS) $(LDFLAGS) $(SHARED_FLAGS) -o $@ $< $(PLUGIN_LIBS)
# Probably should separate the various flags like the following: # Probably should separate the various flags like the following:
# $(CC) $(PLUG_CPPFLAGS) $(PLUG_CFLAGS) $(PLUG_LDFLAGS) -o $@ $< $(PLUG_LIBS) # $(CC) $(PLUG_CPPFLAGS) $(PLUG_CFLAGS) $(PLUG_LDFLAGS) -o $@ $< $(PLUG_LIBS)

4
docs/CHANGES.txt
View file

@ -215,6 +215,10 @@ https://tuxpaint.org/
unnecessarily long. The app buildle build time is now ~20x faster. unnecessarily long. The app buildle build time is now ~20x faster.
Mark Kim <markuskimius@gmail.com> Mark Kim <markuskimius@gmail.com>
* Add missing dependencies in Makefile which result in build failures
when building with the --shuffle flag for GNU make.
Philipp Rösner <rndxelement@protonmail.com>
* Documentation updates: * Documentation updates:
--------------------- ---------------------
* New "Quickstart Guide" document added. * New "Quickstart Guide" document added.