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