Bug 1447907 - Port bug 1429875 to TB: re-write linkage logic in moz.build. rs=bustage-fix DONTBUILD CLOSED TREE

--HG--
extra : rebase_source : d085e1e5be62e86f5aa04d8e80235afd59c1be87
extra : amend_source : e26cdc044c259aee158b517095d16488ddcbf413

calendar/libical/src/libical/Makefile.in

@@ -42,18 +42,6 @@ ifneq (,$(filter BeOS Darwin OpenVMS NetBSD FreeBSD,$(OS_ARCH)))
 DEFINES	+= -D__USE_BSD=1
 endif
 
-INSTALL_TARGETS += ical
-ical_FILES := ical.h
-ical_DEST = $(DIST)/include
-ical_TARGET := export
-
-CSRCS += \
-	icalderivedparameter.c \
-	icalderivedproperty.c \
-	icalderivedvalue.c \
-	icalrestriction.c \
-	$(NULL)
-
 include $(moztopsrcdir)/config/rules.mk
 
 ######################################################################

calendar/libical/src/libical/moz.build

@@ -28,6 +28,28 @@ UNIFIED_SOURCES += [
     'vsnprintf.c',
 ]
 
+SOURCES += [
+    '!icalderivedparameter.c',
+    '!icalderivedproperty.c',
+    '!icalderivedvalue.c',
+    '!icalrestriction.c',
+]
+
+GENERATED_FILES += [
+    'ical.h',
+    'icalderivedparameter.c',
+    'icalderivedparameter.h',
+    'icalderivedproperty.c',
+    'icalderivedproperty.h',
+    'icalderivedvalue.c',
+    'icalderivedvalue.h',
+    'icalrestriction.c',
+]
+
+EXPORTS += [
+    '!ical.h'
+]
+
 # We allow warnings for third-party code that can be updated from upstream.
 AllowCompilerWarnings()