diff options
| author | Thomas Arnhold <thomas@arnhold.org> | 2011-02-02 11:51:53 +0100 |
|---|---|---|
| committer | Thomas Arnhold <thomas@arnhold.org> | 2011-02-02 11:51:53 +0100 |
| commit | c7effb5f5d396d2ddef5beaabb68c1dbffdbb3ac (patch) | |
| tree | d78a604772cf4e74a728b24db71ee20241859786 /odk | |
| parent | c467f8aca17c70b687acd1ec57a8c681469a4247 (diff) | |
Clean up makefiles
Diffstat (limited to 'odk')
| -rw-r--r-- | odk/settings/settings.mk | 4 | ||||
| -rw-r--r-- | odk/util/makefile.pmk | 30 |
2 files changed, 0 insertions, 34 deletions
diff --git a/odk/settings/settings.mk b/odk/settings/settings.mk index 188ff880255e..149acc9d3fd6 100644 --- a/odk/settings/settings.mk +++ b/odk/settings/settings.mk @@ -81,10 +81,8 @@ PATH_SEPARATOR=; # use this for release version CC_FLAGS=-c -MT -Zm500 -Zc:forScope,wchar_t- -wd4251 -wd4275 -wd4290 -wd4675 -wd4786 -wd4800 -Zc:forScope -GR -EHa ifeq "$(CPP_MANIFEST)" "true" -#CC_FLAGS+=-EHa -Zc:wchar_t- LINK_MANIFEST=mt -manifest $@.manifest "-outputresource:$@;2" else -#CC_FLAGS+= LINK_MANIFEST= endif ifeq "$(DEBUG)" "yes" @@ -363,7 +361,6 @@ LIBRARY_LINK_FLAGS+=-fPIC endif COMP_LINK_FLAGS=$(LIBRARY_LINK_FLAGS) -Wl,--version-script,$(PRJ)/settings/component.uno.map -#EXE_LINK_FLAGS=-Wl,--allow-shlib-undefined -Wl,-export-dynamic -Wl,-z,defs -Wl,--whole-archive -lsalcpprt -Wl,--no-whole-archive EXE_LINK_FLAGS=-Wl,--allow-shlib-undefined -Wl,-export-dynamic -Wl,-z,defs -Wl,--no-whole-archive LINK_LIBS=-L"$(OUT)/lib" -L"$(OO_SDK_HOME)/lib" -L"$(OO_SDK_URE_LIB_DIR)" LINK_JAVA_LIBS=-L"$(OO_SDK_JAVA_HOME)/jre/lib/$(JAVA_PROC_TYPE)" @@ -596,7 +593,6 @@ LIBRARY_LINK_FLAGS=-shared '-Wl,-rpath,$$ORIGIN' COMP_LINK_FLAGS=$(LIBRARY_LINK_FLAGS) -Wl,--version-script,$(PRJ)/settings/component.uno.map EXE_LINK_FLAGS=-Wl,--allow-shlib-undefined -#EXE_LINK_FLAGS+=-Wl,-export-dynamic -Wl,-z,defs LINK_LIBS=-L"$(OUT)/lib" -L"$(OO_SDK_HOME)/lib" -L"$(OO_SDK_URE_LIB_DIR)" $(PTHREAD_LIBS) LINK_JAVA_LIBS=-L"$(OO_SDK_JAVA_HOME)/jre/lib/$(JAVA_PROC_TYPE)" diff --git a/odk/util/makefile.pmk b/odk/util/makefile.pmk index b497977762d9..450adc919f90 100644 --- a/odk/util/makefile.pmk +++ b/odk/util/makefile.pmk @@ -81,8 +81,6 @@ MY_TEXTCOPY=@cp #-------------------- # WNT ONLY #-------------------- -#MY_DELETE_RECURSIVE=+del /sxyf -#MY_TEXTCOPY=cat MY_DLLPREFIX= MY_DLLPOSTFIX=.dll @@ -101,11 +99,6 @@ DESTDIRCLI=$(DESTDIR)/cli .ELSE #-------------------- -# UNX ONLYDESTDIRCPPEXAMPLES=$(DESTDIR)/examples/cpp - -#-------------------- -#MY_DELETE_RECURSIVE=rm -rf -#MY_TEXTCOPY= tr -d "\015" MY_DLLPREFIX=lib .IF "$(OS)"=="MACOSX" @@ -117,64 +110,41 @@ MY_DLLOUT=$(OUT)/lib DLLOUT=$(SOLARLIBDIR) .IF "$(OS)$(CPU)"=="SOLARISS" -############## # SOLARIS SPARC -############## DESTPLATFROM=solsparc .ELIF "$(OS)$(CPU)"=="SOLARISU" -############## # SOLARIS SPARC 64 -############## DESTPLATFROM=solsparc64 .ELIF "$(OS)$(CPU)"=="SOLARISI" -########## # SOLARIS INTEL -########## DESTPLATFROM=solintel .ELIF "$(OS)"=="LINUX" -########### # LINUX -########### DESTPLATFROM=linux .ELIF "$(OS)"=="NETBSD" -########### # NETBSD -########### DESTPLATFROM=netbsd .ELIF "$(OS)"=="FREEBSD" -########### # FREEBSD -########### DESTPLATFROM=freebsd .ELIF "$(OS)"=="MACOSX" -########### # MACOSX -########### DESTPLATFROM=macosx .ELIF "$(OS)"=="AIX" -########### # MACOSX -########### DESTPLATFROM=aix .ENDIF -#DESTDIRBIN=$(DESTDIR)/$(DESTPLATFROM)/bin -#DESTDIRLIB=$(DESTDIR)/$(DESTPLATFROM)/lib -#DESTDIRDLL=$(DESTDIRLIB) - .ENDIF -#MY_TEXTCOPY_SOURCEPRE=< -#MY_TEXTCOPY_TARGETPRE=> - INCLUDETOPDIRLIST= \ $(INCOUT)/sal \ |