Skip to content

Commit

Permalink
Merge pull request #216 from wrapl/dev
Browse files Browse the repository at this point in the history
dev
  • Loading branch information
rajamukherji authored Oct 18, 2024
2 parents 2178e48 + 58c82b0 commit 070b7a8
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 8 deletions.
9 changes: 5 additions & 4 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,11 @@ minilang/lib/libminilang.a: minilang/Makefile minilang/src/*.c minilang/src/*.h
radb/libradb.a: radb/Makefile radb/*.c radb/*.h
$(MAKE) -C radb PLATFORM=$(PLATFORM) libradb.a RADB_MEM=GC

obj/%_init.c: src/%.c | obj src/*.h
libraries = \
minilang/lib/libminilang.a \
radb/libradb.a

obj/%_init.c: src/%.c | obj $(libraries) src/*.h
cc -E -P -DGENERATE_INIT $(CFLAGS) $< | sed -f sed.txt | grep -o 'INIT_CODE .*);' | sed 's/INIT_CODE //g' > $@

obj/rabs.o: obj/rabs_init.c src/*.h
Expand Down Expand Up @@ -54,9 +58,6 @@ objects = \
obj/library.o \
obj/whereami.o

libraries = \
minilang/lib/libminilang.a radb/libradb.a

obj/%.o: src/%.c | obj $(libraries) src/*.h
$(CC) $(CFLAGS) -c -o $@ $<

Expand Down
5 changes: 3 additions & 2 deletions debian/changelog
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
rabs (2.32.3) UNRELEASED; urgency=medium
rabs (2.33.0) UNRELEASED; urgency=medium

* Updates.
* Updates.
Expand Down Expand Up @@ -71,5 +71,6 @@ rabs (2.32.3) UNRELEASED; urgency=medium
* Updates.
* Updates.
* Updates.
* Updates.

-- Raja Mukherji <raja@hinano> Fri, 06 Sep 2024 16:52:59 +0100
-- Raja Mukherji <raja@hinano> Fri, 18 Oct 2024 11:32:35 +0100
2 changes: 1 addition & 1 deletion minilang
Submodule minilang updated 676 files
2 changes: 1 addition & 1 deletion src/rabs.h
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ extern __thread target_t *CurrentTarget;
ml_value_t *rabs_global(const char *Name);
ml_value_t *rabs_ml_global(void *Data, const char *Name, const char *Source, int Line, int Mode);

#define CURRENT_VERSION 2, 32, 3
#define CURRENT_VERSION 2, 33, 0
#define MINIMAL_VERSION 2, 10, 0

#endif

0 comments on commit 070b7a8

Please sign in to comment.