diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2011-08-31 13:18:31 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2011-08-31 13:18:31 +0100 |
| commit | 8e3ef76ccf9477289db86f503a48232c524f48ad (patch) | |
| tree | 0ba286db7c92c737fd243376c9f4406a76373cc0 /l10ntools | |
| parent | d88ba9af3546973355ff3d6f40bc1243b15a8656 (diff) | |
bah, three-way merge screwed us
Diffstat (limited to 'l10ntools')
| -rw-r--r-- | l10ntools/source/makefile.mk | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/l10ntools/source/makefile.mk b/l10ntools/source/makefile.mk index 60832f6931d3..0f3dc6618c68 100644 --- a/l10ntools/source/makefile.mk +++ b/l10ntools/source/makefile.mk @@ -79,6 +79,7 @@ APP1STDLIBS+= \ $(TOOLSLIB) \ $(COMPHELPERLIB) \ $(SALLIB) + APP1LIBS+= $(LB)$/$(TARGET).lib APP1DEPN= $(OBJ)$/src_yy_wrapper.obj $(LB)$/$(TARGET).lib @@ -90,14 +91,12 @@ APP2STDLIBS+= \ $(TOOLSLIB) \ $(COMPHELPERLIB) \ $(SALLIB) - $(COMPHELPERLIB) # extractor and merger for *.lng and *.lng APP3TARGET= ulfex APP3OBJS= $(OBJ)$/lngmerge.obj $(OBJ)$/merge.obj $(OBJ)$/export2.obj $(OBJ)$/lngex.obj APP3RPATH= NONE APP3STDLIBS+= \ - $(COMPHELPERLIB) \ $(TOOLSLIB) \ $(COMPHELPERLIB) \ $(SALLIB) @@ -114,7 +113,6 @@ APP5STDLIBS+= \ APP6TARGET= cfgex APP6OBJS= $(OBJ)$/cfgmerge.obj $(OBJ)$/cfg_yy_wrapper.obj $(OBJ)$/merge.obj $(OBJ)$/export2.obj APP6STDLIBS+= \ - $(COMPHELPERLIB) \ $(TOOLSLIB) \ $(COMPHELPERLIB) \ $(SALLIB) @@ -124,7 +122,6 @@ APP7TARGET= xrmex APP7OBJS= $(OBJ)$/xrmmerge.obj $(OBJ)$/xrm_yy_wrapper.obj $(OBJ)$/merge.obj $(OBJ)$/export2.obj APP7RPATH= NONE APP7STDLIBS+= \ - $(COMPHELPERLIB) \ $(TOOLSLIB) \ $(COMPHELPERLIB) \ $(SALLIB) @@ -136,7 +133,6 @@ EXCEPTIONSFILES= \ APP9OBJS= $(OBJ)$/localize.obj $(OBJ)$/srciter.obj $(OBJ)$/export2.obj $(OBJ)$/file.obj $(OBJ)$/directory.obj APP9STDLIBS+= \ - $(COMPHELPERLIB) \ $(TOOLSLIB) \ $(COMPHELPERLIB) \ $(ICUINLIB) \ |