xgiovio/dvdisaster
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Adjust configure and makefile for inlined-icons.c

Browse Source
This commit is contained in:
Paul Dicker
2025-04-21 20:14:54 +02:00
committed by Stéphane Lesimple
parent da612c8a3a
commit dc0e03073d
2 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
GNUmakefile.template
View File

@@ -124,7 +124,7 @@ ${BUILDTMP}/closure.o : src/closure.c $(ICONS)
# Building the dvdisaster binary # Building the dvdisaster binary
dvdisaster: $(ICONS) $(OFILES) dvdisaster: $(OFILES)
@echo "Linking : dvdisaster" @echo "Linking : dvdisaster"
@if test $(CFG_SYS_OPTIONS) == -DSYS_MINGW; \ @if test $(CFG_SYS_OPTIONS) == -DSYS_MINGW; \
then windres -v src/winres.rc -O coff -o ${BUILDTMP}/winres.o >/dev/null ; \ then windres -v src/winres.rc -O coff -o ${BUILDTMP}/winres.o >/dev/null ; \
@@ -137,7 +137,7 @@ dvdisaster: $(ICONS) $(OFILES)
else $(MAKE) --no-print-directory -C locale; \ else $(MAKE) --no-print-directory -C locale; \
fi fi
src/inlined-icons.c: icons/icons.gresource.xml icons/cd.svg icons/close.svg icons/create.svg icons/fix.svg icons/help.svg icons/log.svg icons/open-ecc.svg icons/open-img.svg icons/preferences.svg icons/quit.svg icons/read-symbolic.svg icons/scan.svg icons/stop.svg icons/strip.svg icons/verify.svg $(BUILDTMP)/inlined-icons.c: icons/icons.gresource.xml icons/cd.svg icons/close.svg icons/create.svg icons/fix.svg icons/help.svg icons/log.svg icons/open-ecc.svg icons/open-img.svg icons/preferences.svg icons/quit.svg icons/read-symbolic.svg icons/scan.svg icons/stop.svg icons/strip.svg icons/verify.svg
@echo "Generating:" $(ICONS) @echo "Generating:" $(ICONS)
glib-compile-resources --generate-source --target=$(ICONS) --sourcedir=icons icons/icons.gresource.xml glib-compile-resources --generate-source --target=$(ICONS) --sourcedir=icons icons/icons.gresource.xml
@@ -335,7 +335,7 @@ distclean: clean
clean: clean:
@echo "Removing rebuildable files" @echo "Removing rebuildable files"
@rm -f *.o "$(BUILDTMP)"/*.o medium.* abbild.* dvdisaster .dvdisaster core core.* *.core @rm -f *.o "$(BUILDTMP)"/*.o medium.* abbild.* dvdisaster .dvdisaster core core.* *.core
@rm -f src/inlined-icons.h src/help-dialogs.h @rm -f "$(BUILDTMP)"/inlined-icons.c src/help-dialogs.h
@find . -name \*\~ -print | xargs rm -f; @find . -name \*\~ -print | xargs rm -f;
@find . -name \*.mo -print | xargs rm -f; @find . -name \*.mo -print | xargs rm -f;
@find . -name \#\*\# -print | xargs rm -f; @find . -name \#\*\# -print | xargs rm -f;

11
configure vendored
View File

@@ -222,7 +222,14 @@ rm -f src/conftest.c src/method-link.c
cfiles="src/method-link.c" cfiles="src/method-link.c"
ofiles="$BUILDTMP/method-link.o" ofiles="$BUILDTMP/method-link.o"
for cfile in src/*.c; do # Only include icons in GUI builds
if test "$cfg_with_gui" == "yes"; then
icons="$BUILDTMP/inlined-icons.c"
else
icons=""
fi
for cfile in $icons src/*.c; do
cfile_prefix=`echo $cfile | sed -e 's/\.c//'` cfile_prefix=`echo $cfile | sed -e 's/\.c//'`
cfiles="$cfiles $cfile" cfiles="$cfiles $cfile"
ofiles="$ofiles $BUILDTMP/$(basename $cfile_prefix.o)" ofiles="$ofiles $BUILDTMP/$(basename $cfile_prefix.o)"
@@ -233,7 +240,7 @@ echo
echo -e "\nCFG_CFILES = $cfiles" >> Makefile.config echo -e "\nCFG_CFILES = $cfiles" >> Makefile.config
echo "CFG_OFILES = $ofiles" >> Makefile.config echo "CFG_OFILES = $ofiles" >> Makefile.config
if test "$cfg_with_gui" == "yes"; then if test "$cfg_with_gui" == "yes"; then
echo "ICONS = src/inlined-icons.c" >> Makefile.config echo "ICONS = $icons" >> Makefile.config
fi fi
# Create the method wrapper # Create the method wrapper