| 1 |
From: Nicolas Schodet <[email protected]> |
| 2 |
Last-Update: 2025-08-10 |
| 3 |
Subject: Add missing dependencies |
| 4 |
|
| 5 |
Bug-Debian: https://bugs.debian.org/1105267 |
| 6 |
Forwarded: https://github.com/rosorio/buici-clock/pull/1 |
| 7 |
--- |
| 8 |
Makefile.in | 25 ++++++++++++------------- |
| 9 |
xo/Makefile.in | 11 ++++++----- |
| 10 |
2 files changed, 18 insertions(+), 18 deletions(-) |
| 11 |
|
| 12 |
diff --git a/Makefile.in b/Makefile.in |
| 13 |
index 0ec5e90..1175962 100644 |
| 14 |
--- a/Makefile.in |
| 15 |
+++ b/Makefile.in |
| 16 |
@@ -99,33 +99,27 @@ mandir = $(prefix)/share/man |
| 17 |
|
| 18 |
vpath %.o $(O_D) |
| 19 |
|
| 20 |
-%.o: %.cc |
| 21 |
- $(make_o) |
| 22 |
+%.o: %.cc | make_o |
| 23 |
$(ECHO) $(CC) -c $(CXXFLAGS) -o $(O_D)$@ $< |
| 24 |
@$(CC) -c $(CXXFLAGS) $(CXXFLAGS_) -o $(O_D)$@ $< |
| 25 |
|
| 26 |
-%.o: %.cxx |
| 27 |
- $(make_o) |
| 28 |
+%.o: %.cxx | make_o |
| 29 |
$(ECHO) $(CC) -c $(CXXFLAGS) -o $(O_D)$@ $< |
| 30 |
@$(CC) -c $(CXXFLAGS) $(CXXFLAGS_) -o $(O_D)$@ $< |
| 31 |
|
| 32 |
-$(O_D)%.o: %.cxx |
| 33 |
- $(make_o) |
| 34 |
+$(O_D)%.o: %.cxx | make_o |
| 35 |
$(ECHO) $(CC) -c $(CXXFLAGS) -o $@ $< |
| 36 |
@$(CC) -c $(CXXFLAGS) $(CXXFLAGS_) -o $@ $< |
| 37 |
|
| 38 |
-$(O_D)%.o: %.cc |
| 39 |
- $(make_o) |
| 40 |
+$(O_D)%.o: %.cc | make_o |
| 41 |
$(ECHO) $(CC) -c $(CXXFLAGS) -o $@ $< |
| 42 |
@$(CC) -c $(CXXFLAGS) $(CXXFLAGS_) -o $@ $< |
| 43 |
|
| 44 |
-%.o: %.s |
| 45 |
- $(make_o) |
| 46 |
+%.o: %.s | make_o |
| 47 |
$(ECHO) $(AS) $(AFLAGS) -o $(O_D)$@ $< |
| 48 |
@$(AS) $(AFLAGS) $(AFLAGS_) -o $(O_D)$@ $< |
| 49 |
|
| 50 |
-$(O_D)%.o: %.s |
| 51 |
- $(make_o) |
| 52 |
+$(O_D)%.o: %.s | make_o |
| 53 |
$(ECHO) $(AS) $(AFLAGS) -o $@ $< |
| 54 |
@$(AS) $(AFLAGS) $(AFLAGS_) -o $@ $< |
| 55 |
|
| 56 |
@@ -155,16 +149,19 @@ make_o: |
| 57 |
@if test ! -e $(O_D) ;\ |
| 58 |
then echo === Creating \'$(O_D)\' output directory ; mkdir $(O_D) ; fi |
| 59 |
|
| 60 |
+.PHONY: xolib |
| 61 |
xolib: |
| 62 |
@if test ! "${XO_PATH}" = "../xo" ; \ |
| 63 |
then (cd ${XO_PATH} ; [ -f config.log ] || ./configure ; $(MAKE) all) ; fi |
| 64 |
|
| 65 |
+$(XO_PATH)/libxo.a: xolib |
| 66 |
+ |
| 67 |
$(O_D)$(TARGET): $(OBJ) $(XO_PATH)/libxo.a |
| 68 |
$(CC) -o $@ $(addprefix $(O_D),$(OBJ)) $(LFLAGS) |
| 69 |
|
| 70 |
$(TARGET): $(O_D)$(TARGET) |
| 71 |
@echo -- Linking $(TARGET) to $(O_D)$(TARGET) |
| 72 |
- @ln -s $(O_D)$(TARGET) . |
| 73 |
+ @ln -sf $(O_D)$(TARGET) . |
| 74 |
|
| 75 |
#install: |
| 76 |
# cp $(TARGET).exe c:/usr/local |
| 77 |
@@ -197,6 +194,8 @@ distclean dist_clean: clean |
| 78 |
# --- Version and Build Engineering |
| 79 |
# |
| 80 |
|
| 81 |
+version.cxx: _version.h |
| 82 |
+ |
| 83 |
.version: .version_major .version_minor .version_patch |
| 84 |
@/bin/echo -n `cat .version_major`.`cat .version_minor`.`cat \ |
| 85 |
.version_patch` > .version |
| 86 |
diff --git a/xo/Makefile.in b/xo/Makefile.in |
| 87 |
index 8a9ef82..5b80d4b 100644 |
| 88 |
--- a/xo/Makefile.in |
| 89 |
+++ b/xo/Makefile.in |
| 90 |
@@ -84,19 +84,19 @@ datarootdir = @datarootdir@ |
| 91 |
|
| 92 |
vpath %.o $(O_D) |
| 93 |
|
| 94 |
-%.o: %.cxx |
| 95 |
+%.o: %.cxx | make_o |
| 96 |
$(ECHO) $(CC) -c $(CXXFLAGS) -o $(O_D)$@ $< |
| 97 |
@$(CC) -c $(CXXFLAGS) $(CXXFLAGS_) -o $(O_D)$@ $< |
| 98 |
|
| 99 |
-$(O_D)%.o: %.cxx |
| 100 |
+$(O_D)%.o: %.cxx | make_o |
| 101 |
$(ECHO) $(CC) -c $(CXXFLAGS) -o $@ $< |
| 102 |
@$(CC) -c $(CXXFLAGS) $(CXXFLAGS_) -o $@ $< |
| 103 |
|
| 104 |
-%.o: %.s |
| 105 |
+%.o: %.s | make_o |
| 106 |
$(ECHO) $(AS) $(AFLAGS) -o $(O_D)$@ $< |
| 107 |
@$(AS) $(AFLAGS) $(AFLAGS_) -o $(O_D)$@ $< |
| 108 |
|
| 109 |
-$(O_D)%.o: %.s |
| 110 |
+$(O_D)%.o: %.s | make_o |
| 111 |
$(ECHO) $(AS) $(AFLAGS) -o $@ $< |
| 112 |
@$(AS) $(AFLAGS) $(AFLAGS_) -o $@ $< |
| 113 |
|
| 114 |
@@ -128,8 +128,9 @@ make_o: |
| 115 |
|
| 116 |
res_l.cxx: res_l.l |
| 117 |
res_y.cxx: res_y.y |
| 118 |
+res_y.hxx: res_y.cxx |
| 119 |
|
| 120 |
-$(O_D)res.o: lres.h |
| 121 |
+$(O_D)res.o: lres.h res_y.hxx |
| 122 |
|
| 123 |
res: o/res_y.o o/res_l.o o/res.o |
| 124 |
$(CC) $(LFLAGS) -o $@ $^ |