diff options
| author | Michael Stahl <mstahl@redhat.com> | 2012-11-30 21:28:00 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2012-11-30 21:28:00 +0100 |
| commit | ebb4150463ef97571d8f4ffc0b8189ff94d5cf1a (patch) | |
| tree | 7a1c5bd2194bd10297a95d0a416ef7b292afa9ed /filter | |
| parent | 0cdc6ea49f0b6d915bf11769991101019e5f7c18 (diff) | |
filter: try to use the Python implementation of FCFGMerge
... seems to work here, and if nobody complains about broken filter
configurations we can remove the Java FCFGMerge implementation.
Change-Id: I0cf2de604bb9c34678174bdf951e70d499ea7df1
Diffstat (limited to 'filter')
| -rw-r--r-- | filter/Configuration_filter.mk | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/filter/Configuration_filter.mk b/filter/Configuration_filter.mk index dd4a09d8a9a5..f84058e6e837 100644 --- a/filter/Configuration_filter.mk +++ b/filter/Configuration_filter.mk @@ -21,15 +21,10 @@ # most of the rules here use some weird merge program, and this is sort of # semi-integrated with the stuff from Configuration.mk; not exactly pretty... -ifeq ($(SOLAR_JAVA),) filter_MERGE_TARGET := $(gb_PYTHONTARGET) \ $(SRCDIR)/filter/source/config/tools/merge/pyAltFCFGMerge filter_MERGE := $(gb_PYTHON) \ $(SRCDIR)/filter/source/config/tools/merge/pyAltFCFGMerge -else # SOLAR_JAVA -filter_MERGE_TARGET := $(OUTDIR_FOR_BUILD)/bin/FCFGMerge.jar -filter_MERGE := $(JAVAINTERPRETER) $(JAVAIFLAGS) -jar $(filter_MERGE_TARGET) -endif filter_MERGE_CONFIG_TARGET := $(OUTDIR_FOR_BUILD)/inc/l10ntools/FCFGMerge.cfg ### filter configuration rules: generic stuff ####################### |