Clean up makefiles
This commit is contained in:
@@ -44,9 +44,6 @@ CDEFS+= -DVERBOSE
|
|||||||
CDEFS+= -DPROFILER
|
CDEFS+= -DPROFILER
|
||||||
.ENDIF
|
.ENDIF
|
||||||
|
|
||||||
#CFLAGS +:= /Ox /Ot # THIS IS IMPORTANT
|
|
||||||
|
|
||||||
|
|
||||||
.IF "$(L10N_framework)"==""
|
.IF "$(L10N_framework)"==""
|
||||||
SLOFILES = \
|
SLOFILES = \
|
||||||
$(SLO)$/cachedprimitivebase.obj \
|
$(SLO)$/cachedprimitivebase.obj \
|
||||||
|
@@ -30,6 +30,7 @@ TARGET = ComphelperComplexTests
|
|||||||
PRJNAME = comphelper
|
PRJNAME = comphelper
|
||||||
|
|
||||||
# --- Settings -----------------------------------------------------
|
# --- Settings -----------------------------------------------------
|
||||||
|
|
||||||
.INCLUDE: settings.mk
|
.INCLUDE: settings.mk
|
||||||
|
|
||||||
#----- compile .java files -----------------------------------------
|
#----- compile .java files -----------------------------------------
|
||||||
@@ -42,7 +43,6 @@ JAVACLASSFILES := $(foreach,i,$(JAVAFILES) $(CLASSDIR)$/$(i:d)$/$(i:b).class)
|
|||||||
|
|
||||||
MAXLINELENGTH = 100000
|
MAXLINELENGTH = 100000
|
||||||
|
|
||||||
#JARCLASSDIRS =
|
|
||||||
JARTARGET = $(TARGET).jar
|
JARTARGET = $(TARGET).jar
|
||||||
JARCOMPRESS = TRUE
|
JARCOMPRESS = TRUE
|
||||||
|
|
||||||
|
@@ -32,7 +32,6 @@ TARGET=dndTest
|
|||||||
TARGETTYPE=CUI
|
TARGETTYPE=CUI
|
||||||
LIBTARGET=NO
|
LIBTARGET=NO
|
||||||
|
|
||||||
#USE_DEFFILE= TRUE
|
|
||||||
ENABLE_EXCEPTIONS=TRUE
|
ENABLE_EXCEPTIONS=TRUE
|
||||||
|
|
||||||
# --- Settings ---
|
# --- Settings ---
|
||||||
@@ -41,7 +40,6 @@ ENABLE_EXCEPTIONS=TRUE
|
|||||||
|
|
||||||
# --- Files ---
|
# --- Files ---
|
||||||
|
|
||||||
# CFLAGS+=-GR -DUNICODE -D_UNICODE
|
|
||||||
CFLAGS+= -D_WIN32_DCOM
|
CFLAGS+= -D_WIN32_DCOM
|
||||||
|
|
||||||
INCPRE+= -I$(ATL_INCLUDE)
|
INCPRE+= -I$(ATL_INCLUDE)
|
||||||
@@ -73,8 +71,6 @@ APP1LIBS= \
|
|||||||
$(SLB)$/dtobjfact.lib \
|
$(SLB)$/dtobjfact.lib \
|
||||||
$(SLB)$/dtutils.lib
|
$(SLB)$/dtutils.lib
|
||||||
|
|
||||||
# $(SOLARLIBDIR)$/imtaolecb.lib\
|
|
||||||
|
|
||||||
APP1DEF= $(MISC)\$(APP1TARGET).def
|
APP1DEF= $(MISC)\$(APP1TARGET).def
|
||||||
|
|
||||||
# --- Targets ---
|
# --- Targets ---
|
||||||
|
@@ -31,7 +31,6 @@ INCPRE=$(MISC)
|
|||||||
|
|
||||||
PRJNAME=l10ntools
|
PRJNAME=l10ntools
|
||||||
TARGET=tralay
|
TARGET=tralay
|
||||||
#TARGETTYPE=GUI
|
|
||||||
TARGETTYPE=CUI
|
TARGETTYPE=CUI
|
||||||
LIBTARGET=no
|
LIBTARGET=no
|
||||||
|
|
||||||
|
@@ -35,18 +35,10 @@ PACKAGE = com$/sun$/star$/filter$/config$/tools$/merge
|
|||||||
.INCLUDE: settings.mk
|
.INCLUDE: settings.mk
|
||||||
|
|
||||||
#----- compile .java files -----------------------------------------
|
#----- compile .java files -----------------------------------------
|
||||||
#.IF "$(L10N_framework)"==""
|
|
||||||
|
|
||||||
OWNCOPY = \
|
OWNCOPY = \
|
||||||
$(MISC)$/$(TARGET)_copied.done
|
$(MISC)$/$(TARGET)_copied.done
|
||||||
|
|
||||||
#JARFILES = \
|
|
||||||
# ridl.jar \
|
|
||||||
# unoil.jar \
|
|
||||||
# jurt.jar \
|
|
||||||
# juh.jar \
|
|
||||||
# java_uno.jar
|
|
||||||
|
|
||||||
CFGFILES = \
|
CFGFILES = \
|
||||||
FCFGMerge.cfg
|
FCFGMerge.cfg
|
||||||
|
|
||||||
@@ -85,8 +77,3 @@ $(OWNCOPY) : $(CFGFILES)
|
|||||||
$(COPY) $? $(CLASSDIR)$/$(PACKAGE) && $(TOUCH) $@
|
$(COPY) $? $(CLASSDIR)$/$(PACKAGE) && $(TOUCH) $@
|
||||||
|
|
||||||
.ENDIF # "$(SOLAR_JAVA)" != ""
|
.ENDIF # "$(SOLAR_JAVA)" != ""
|
||||||
|
|
||||||
#.ELSE
|
|
||||||
#pseudo:
|
|
||||||
|
|
||||||
#.ENDIF
|
|
||||||
|
@@ -61,7 +61,6 @@ SHL1STDLIBS= \
|
|||||||
$(SALLIB)
|
$(SALLIB)
|
||||||
|
|
||||||
SHL1DEF= $(MISC)$/$(SHL1TARGET).def
|
SHL1DEF= $(MISC)$/$(SHL1TARGET).def
|
||||||
#SHL1DEPN= $(SHL1IMPLIBN) $(SHL1TARGETN)
|
|
||||||
|
|
||||||
DEF1NAME= $(SHL1TARGET)
|
DEF1NAME= $(SHL1TARGET)
|
||||||
|
|
||||||
|
@@ -31,7 +31,6 @@ PRJNAME=svl
|
|||||||
TARGET=svl
|
TARGET=svl
|
||||||
RESTARGETSIMPLE=svs
|
RESTARGETSIMPLE=svs
|
||||||
GEN_HID=TRUE
|
GEN_HID=TRUE
|
||||||
# GEN_HID_OTHER=TRUE
|
|
||||||
ENABLE_EXCEPTIONS=TRUE
|
ENABLE_EXCEPTIONS=TRUE
|
||||||
|
|
||||||
# --- Settings -----------------------------------------------------
|
# --- Settings -----------------------------------------------------
|
||||||
|
@@ -43,7 +43,6 @@ dummy:
|
|||||||
|
|
||||||
ZIPFLAGS = -r
|
ZIPFLAGS = -r
|
||||||
ZIP1TARGET = osxres
|
ZIP1TARGET = osxres
|
||||||
#ZIP1DIR =
|
|
||||||
ZIP1LIST = MainMenu.nib/*.nib cursors/*.png
|
ZIP1LIST = MainMenu.nib/*.nib cursors/*.png
|
||||||
|
|
||||||
# --- Targets --------------------------------------------------
|
# --- Targets --------------------------------------------------
|
||||||
|
Reference in New Issue
Block a user