From de97337a13ffd480355148da252859a205e10b74 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hugo=20H=C3=B6rnquist?= Date: Sun, 6 Oct 2019 19:53:27 +0200 Subject: Fix re-export of add-child! --- Makefile | 5 +++-- module/vcomponent.scm | 4 +++- module/vcomponent/base.scm | 5 ++--- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/Makefile b/Makefile index a3fe93d2..2065bda9 100644 --- a/Makefile +++ b/Makefile @@ -17,8 +17,6 @@ C_FILES = $(wildcard src/*.c) SCM_C_FILES = $(wildcard src/*.scm.c) X_FILES = $(SCM_C_FILES:.scm.c=.x) -.SECONDARY: $(X_FILES) - O_FILES = $(C_FILES:src/%.c=obj/%.o) SCM_FILES = $(shell find module/ -type f -name \*.scm) @@ -30,6 +28,9 @@ GUILE_C_FLAGS = -Lmodule \ -Wmacro-use-before-definition -Warity-mismatch \ -Wduplicate-case-datum -Wbad-case-datum +.SECONDARY: $(X_FILES) $(O_FILES) + + all: $(SO_FILES) $(GO_FILES) diff --git a/module/vcomponent.scm b/module/vcomponent.scm index 4d13dbc8..a65ef2d4 100644 --- a/module/vcomponent.scm +++ b/module/vcomponent.scm @@ -1,5 +1,7 @@ (define-module (vcomponent) - #:use-module ((vcomponent primitive) :select (parse-cal-path (make-vcomponent . primitive-make-vcomponent))) + #:use-module ((vcomponent primitive) + :select (parse-cal-path + (make-vcomponent . primitive-make-vcomponent))) #:use-module (vcomponent datetime) #:use-module (vcomponent recurrence) #:use-module (vcomponent timezone) diff --git a/module/vcomponent/base.scm b/module/vcomponent/base.scm index 69fab656..3072c0a5 100644 --- a/module/vcomponent/base.scm +++ b/module/vcomponent/base.scm @@ -4,9 +4,8 @@ :use-module (srfi srfi-17) :use-module (vcomponent primitive) :use-module (ice-9 hash-table) - :use-module ((ice-9 optargs) :select (define*-public))) - -(export add-child!) + :use-module ((ice-9 optargs) :select (define*-public)) + :re-export (add-child!)) ;; vline → value (define-public value -- cgit v1.2.3