[Libreoffice-commits] .: src/lib

[Libreoffice Gerrit user]

 src/lib/Makefile.am |    3 --
 src/lib/makefile.mk |   64 ----------------------------------------------------
 2 files changed, 1 insertion(+), 66 deletions(-)

New commits:
commit a1e065eefb22f877b231f19895c41090df4bb3f6
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date:   Mon Jan 28 11:09:14 2013 +0100

    no need of makefile.mk anymore

diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am
index 69d7497..5c776e2 100644
--- a/src/lib/Makefile.am
+++ b/src/lib/Makefile.am
@@ -64,8 +64,7 @@ endif
 
 
 EXTRA_DIST = \
-	libcdr.rc.in \
-	makefile.mk
+	libcdr.rc.in
 
 # These may be in the builddir too
 BUILD_EXTRA_DIST = \
diff --git a/src/lib/makefile.mk b/src/lib/makefile.mk
deleted file mode 100644
index a087c44..0000000
--- a/src/lib/makefile.mk
+++ /dev/null
@@ -1,64 +0,0 @@
-EXTERNAL_WARNINGS_NOT_ERRORS := TRUE
-
-PRJ=..$/..$/..$/..$/..$/..
-
-PRJNAME=libcdr
-TARGET=cdrlib
-ENABLE_EXCEPTIONS=TRUE
-LIBTARGET=NO
-
-.INCLUDE :  settings.mk
-
-.IF "$(GUI)$(COM)"=="WNTMSC"
-CFLAGS+=-GR
-.ENDIF
-.IF "$(COM)"=="GCC"
-CFLAGSCXX+=-frtti
-.ENDIF
-
-.IF "$(SYSTEM_LIBWPD)" == "YES"
-INCPRE+=$(WPD_CFLAGS)
-.ELSE
-INCPRE+=$(SOLARVER)$/$(INPATH)$/inc$/libwpd
-.ENDIF
-
-.IF "$(SYSTEM_LIBWPG)" == "YES"
-INCPRE+=$(WPG_CFLAGS)
-.ELSE
-INCPRE+=$(SOLARVER)$/$(INPATH)$/inc$/libwpg
-.ENDIF
-
-.IF "$(SYSTEM_LCMS2)" == "YES"
-INCPRE+=$(LCMS2_CFLAGS)
-.ELSE
-INCPRE+=$(SOLARVER)$/$(INPATH)$/inc$/lcms2
-.ENDIF
-
-.IF "$(SYSTEM_ZLIB)" != "YES"
-INCPRE+=-I$(SOLARVER)$/$(INPATH)$/inc$/external/zlib
-.ENDIF
-
-SLOFILES= \
-    $(SLO)$/CDRCollector.obj \
-    $(SLO)$/CDRContentCollector.obj \
-    $(SLO)$/CDRDocument.obj \
-    $(SLO)$/CDRInternalStream.obj \
-    $(SLO)$/CDROutputElementList.obj \
-    $(SLO)$/CDRParser.obj \
-    $(SLO)$/CDRPath.obj \
-    $(SLO)$/CDRStringVector.obj \
-    $(SLO)$/CDRStylesCollector.obj \
-    $(SLO)$/CDRSVGGenerator.obj \
-    $(SLO)$/CDRTransforms.obj \
-    $(SLO)$/CDRTypes.obj \
-    $(SLO)$/CDRZipStream.obj \
-    $(SLO)$/CMXDocument.obj \
-    $(SLO)$/CMXParser.obj \
-    $(SLO)$/CommonParser.obj \
-    $(SLO)$/libcdr_utils.obj
-
-LIB1ARCHIV=$(LB)$/libcdrlib.a
-LIB1TARGET=$(SLB)$/$(TARGET).lib
-LIB1OBJFILES= $(SLOFILES)
-
-.INCLUDE :  target.mk