From a55d2f6a21a5068a43241f73dd0cadbe28ae6774 Mon Sep 17 00:00:00 2001 From: sb Date: Wed, 3 Feb 2010 11:16:28 +0100 Subject: [PATCH] sb118: makefile dependencies fix --- cppuhelper/qa/propertysetmixin/makefile.mk | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/cppuhelper/qa/propertysetmixin/makefile.mk b/cppuhelper/qa/propertysetmixin/makefile.mk index bfd10bf02ee2..2e8cf10887bf 100644 --- a/cppuhelper/qa/propertysetmixin/makefile.mk +++ b/cppuhelper/qa/propertysetmixin/makefile.mk @@ -113,11 +113,9 @@ $(MISC)/$(TARGET)/javamaker.flag: $(MISC)/$(TARGET)/types.rdb $(JAVAMAKER) -O$(CLASSDIR) -BUCR -nD -Gc -X$(SOLARBINDIR)/types.rdb $< $(TOUCH) $@ -# The following dependency (to execute javac whenever javamaker has run) does -# not work reliably, see #i28827#: -$(JAVAFILES) $(JAVACLASSFILES): $(MISC)/$(TARGET)/javamaker.flag +$(JAVATARGET): $(MISC)/$(TARGET)/javamaker.flag -$(MISC)/$(TARGET)/$(TARGET).uno.jar: $(JAVACLASSFILES) \ +$(MISC)/$(TARGET)/$(TARGET).uno.jar: $(JAVATARGET) \ $(MISC)/$(TARGET)/javamaker.flag manifest jar cfm $@ manifest -C $(CLASSDIR) test/cppuhelper/propertysetmixin