[Libreoffice-commits] .: src/lib

[Libreoffice Gerrit user]

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

New commits:
commit 5b5ec32044798605927ae85da88f9625fcfa5e57
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date:   Mon Jan 28 11:08:42 2013 +0100

    no need of makefile.mk anymore

diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am
index b932314..ec25254 100644
--- a/src/lib/Makefile.am
+++ b/src/lib/Makefile.am
@@ -79,8 +79,7 @@ endif
 
 
 EXTRA_DIST = \
-	libmspub.rc.in \
-	makefile.mk
+	libmspub.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 aa19c3d..0000000
--- a/src/lib/makefile.mk
+++ /dev/null
@@ -1,56 +0,0 @@
-EXTERNAL_WARNINGS_NOT_ERRORS := TRUE
-
-PRJ=..$/..$/..$/..$/..$/..
-
-PRJNAME=libmspub
-TARGET=mspublib
-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) -I..
-.ELSE
-INCPRE+=$(SOLARVER)$/$(INPATH)$/inc$/libwpd
-.ENDIF
-
-.IF "$(SYSTEM_LIBWPG)" == "YES"
-INCPRE+=$(WPG_CFLAGS) -I..
-.ELSE
-INCPRE+=$(SOLARVER)$/$(INPATH)$/inc$/libwpg
-.ENDIF
-
-.IF "$(SYSTEM_ZLIB)" != "YES"
-INCPRE+=-I$(SOLARVER)$/$(INPATH)$/inc$/external/zlib
-.ENDIF
-
-SLOFILES= \
-    $(SLO)$/ColorReference.obj \
-	$(SLO)$/Dash.obj \
-    $(SLO)$/Fill.obj \
-    $(SLO)$/MSPUBCollector.obj \
-    $(SLO)$/MSPUBDocument.obj \
-    $(SLO)$/MSPUBParser2k.obj \
-	$(SLO)$/MSPUBParser97.obj \
-    $(SLO)$/MSPUBParser.obj \
-    $(SLO)$/MSPUBStringVector.obj \
-    $(SLO)$/MSPUBSVGGenerator.obj \
-    $(SLO)$/PolygonUtils.obj \
-	$(SLO)$/Shadow.obj \
-    $(SLO)$/ShapeGroupElement.obj \
-    $(SLO)$/VectorTransformation2D.obj \
-    $(SLO)$/libmspub_utils.obj
-
-LIB1ARCHIV=$(LB)$/libmspublib.a
-LIB1TARGET=$(SLB)$/$(TARGET).lib
-LIB1OBJFILES= $(SLOFILES)
-
-.INCLUDE :  target.mk