[Libreoffice-commits] .: odk/settings odk/util

[Thomas Arnhold]

 odk/settings/settings.mk |    4 ----
 odk/util/makefile.pmk    |   30 ------------------------------
 2 files changed, 34 deletions(-)

New commits:
commit ed9cbca624c3938707589cf2c23c5ac92e4a7b18
Author: Thomas Arnhold <thomas at arnhold.org>
Date:   Wed Feb 2 11:51:53 2011 +0100

    Clean up makefiles

diff --git a/odk/settings/settings.mk b/odk/settings/settings.mk
index 188ff88..149acc9 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 b497977..450adc9 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 \