From: Nicolas Schodet Last-Update: 2025-08-10 Subject: Add missing dependencies Bug-Debian: https://bugs.debian.org/1105267 Forwarded: https://github.com/rosorio/buici-clock/pull/1 --- Makefile.in | 25 ++++++++++++------------- xo/Makefile.in | 11 ++++++----- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/Makefile.in b/Makefile.in index 0ec5e90..1175962 100644 --- a/Makefile.in +++ b/Makefile.in @@ -99,33 +99,27 @@ mandir = $(prefix)/share/man vpath %.o $(O_D) -%.o: %.cc - $(make_o) +%.o: %.cc | make_o $(ECHO) $(CC) -c $(CXXFLAGS) -o $(O_D)$@ $< @$(CC) -c $(CXXFLAGS) $(CXXFLAGS_) -o $(O_D)$@ $< -%.o: %.cxx - $(make_o) +%.o: %.cxx | make_o $(ECHO) $(CC) -c $(CXXFLAGS) -o $(O_D)$@ $< @$(CC) -c $(CXXFLAGS) $(CXXFLAGS_) -o $(O_D)$@ $< -$(O_D)%.o: %.cxx - $(make_o) +$(O_D)%.o: %.cxx | make_o $(ECHO) $(CC) -c $(CXXFLAGS) -o $@ $< @$(CC) -c $(CXXFLAGS) $(CXXFLAGS_) -o $@ $< -$(O_D)%.o: %.cc - $(make_o) +$(O_D)%.o: %.cc | make_o $(ECHO) $(CC) -c $(CXXFLAGS) -o $@ $< @$(CC) -c $(CXXFLAGS) $(CXXFLAGS_) -o $@ $< -%.o: %.s - $(make_o) +%.o: %.s | make_o $(ECHO) $(AS) $(AFLAGS) -o $(O_D)$@ $< @$(AS) $(AFLAGS) $(AFLAGS_) -o $(O_D)$@ $< -$(O_D)%.o: %.s - $(make_o) +$(O_D)%.o: %.s | make_o $(ECHO) $(AS) $(AFLAGS) -o $@ $< @$(AS) $(AFLAGS) $(AFLAGS_) -o $@ $< @@ -155,16 +149,19 @@ make_o: @if test ! -e $(O_D) ;\ then echo === Creating \'$(O_D)\' output directory ; mkdir $(O_D) ; fi +.PHONY: xolib xolib: @if test ! "${XO_PATH}" = "../xo" ; \ then (cd ${XO_PATH} ; [ -f config.log ] || ./configure ; $(MAKE) all) ; fi +$(XO_PATH)/libxo.a: xolib + $(O_D)$(TARGET): $(OBJ) $(XO_PATH)/libxo.a $(CC) -o $@ $(addprefix $(O_D),$(OBJ)) $(LFLAGS) $(TARGET): $(O_D)$(TARGET) @echo -- Linking $(TARGET) to $(O_D)$(TARGET) - @ln -s $(O_D)$(TARGET) . + @ln -sf $(O_D)$(TARGET) . #install: # cp $(TARGET).exe c:/usr/local @@ -197,6 +194,8 @@ distclean dist_clean: clean # --- Version and Build Engineering # +version.cxx: _version.h + .version: .version_major .version_minor .version_patch @/bin/echo -n `cat .version_major`.`cat .version_minor`.`cat \ .version_patch` > .version diff --git a/xo/Makefile.in b/xo/Makefile.in index 8a9ef82..5b80d4b 100644 --- a/xo/Makefile.in +++ b/xo/Makefile.in @@ -84,19 +84,19 @@ datarootdir = @datarootdir@ vpath %.o $(O_D) -%.o: %.cxx +%.o: %.cxx | make_o $(ECHO) $(CC) -c $(CXXFLAGS) -o $(O_D)$@ $< @$(CC) -c $(CXXFLAGS) $(CXXFLAGS_) -o $(O_D)$@ $< -$(O_D)%.o: %.cxx +$(O_D)%.o: %.cxx | make_o $(ECHO) $(CC) -c $(CXXFLAGS) -o $@ $< @$(CC) -c $(CXXFLAGS) $(CXXFLAGS_) -o $@ $< -%.o: %.s +%.o: %.s | make_o $(ECHO) $(AS) $(AFLAGS) -o $(O_D)$@ $< @$(AS) $(AFLAGS) $(AFLAGS_) -o $(O_D)$@ $< -$(O_D)%.o: %.s +$(O_D)%.o: %.s | make_o $(ECHO) $(AS) $(AFLAGS) -o $@ $< @$(AS) $(AFLAGS) $(AFLAGS_) -o $@ $< @@ -128,8 +128,9 @@ make_o: res_l.cxx: res_l.l res_y.cxx: res_y.y +res_y.hxx: res_y.cxx -$(O_D)res.o: lres.h +$(O_D)res.o: lres.h res_y.hxx res: o/res_y.o o/res_l.o o/res.o $(CC) $(LFLAGS) -o $@ $^