Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 14 additions & 8 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -449,15 +449,18 @@ WINDRES ?= windres
#------------------------------------------------------------------------------

%.o : %.c
$(CC) $(ALL_CFLAGS) $(ALL_CPPFLAGS) -MM -MP -MF $*.d -MT "$@" $<
$(CC) $(ALL_CFLAGS) $(ALL_CPPFLAGS) -o $@ -c $<
@$(CC) $(ALL_CFLAGS) $(ALL_CPPFLAGS) -MM -MP -MF $*.d -MT "$@" $<
@$(CC) $(ALL_CFLAGS) $(ALL_CPPFLAGS) -o $@ -c $<
@echo "$(CC) $<"

%.o : %.cpp
$(CXX) $(ALL_CXXFLAGS) $(ALL_CPPFLAGS) -MM -MP -MF $*.d -MT "$@" $<
$(CXX) $(ALL_CXXFLAGS) $(ALL_CPPFLAGS) -o $@ -c $<
@$(CXX) $(ALL_CXXFLAGS) $(ALL_CPPFLAGS) -MM -MP -MF $*.d -MT "$@" $<
@$(CXX) $(ALL_CXXFLAGS) $(ALL_CPPFLAGS) -o $@ -c $<
@echo "$(CXX) $<"

%.sol : %.map $(MAPC_TARG)
$(MAPC) $< data
@$(MAPC) $< data
@echo "$(MAPC) $<"

%.desktop : %.desktop.in
sh scripts/translate-desktop.sh < $< > $@
Expand All @@ -480,13 +483,16 @@ endif
endif

$(BALL_TARG) : $(BALL_OBJS)
$(LINK) -o $(BALL_TARG) $(BALL_OBJS) $(LDFLAGS) $(ALL_LIBS)
@$(LINK) -o $(BALL_TARG) $(BALL_OBJS) $(LDFLAGS) $(ALL_LIBS)
@echo "LD($(LINK)) $(BALL_TARG)"

$(PUTT_TARG) : $(PUTT_OBJS)
$(LINK) -o $(PUTT_TARG) $(PUTT_OBJS) $(LDFLAGS) $(ALL_LIBS)
@$(LINK) -o $(PUTT_TARG) $(PUTT_OBJS) $(LDFLAGS) $(ALL_LIBS)
@echo "LD($(LINK)) $(PUTT_TARG)"

$(MAPC_TARG) : $(MAPC_OBJS)
$(CC) $(ALL_CFLAGS) -o $(MAPC_TARG) $(MAPC_OBJS) $(LDFLAGS) $(MAPC_LIBS)
@$(CC) $(ALL_CFLAGS) -o $(MAPC_TARG) $(MAPC_OBJS) $(LDFLAGS) $(MAPC_LIBS)
@echo "$(CC) $(MAPC_TARG)"

# Work around some extremely helpful sdl-config scripts.

Expand Down
5 changes: 3 additions & 2 deletions po/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -55,8 +55,9 @@ clean:
update-po: $(DOMAIN).pot-update $(POFILES) $(MOFILES)

$(MODIR)/%/LC_MESSAGES/$(DOMAIN).mo: %.po
mkdir -p $(dir $@)
msgfmt -c --statistics -o $@ $<
@mkdir -p $(dir $@)
@msgfmt -c --statistics -o $@ $<
@echo "MSGFMT $<"

%.po: $(DOMAIN).pot
msgmerge -U --previous $@ $<
Expand Down