diff options
| author | Juergen Schmidt <jsc@openoffice.org> | 2001-09-21 14:40:45 +0000 |
|---|---|---|
| committer | Juergen Schmidt <jsc@openoffice.org> | 2001-09-21 14:40:45 +0000 |
| commit | 884b12c07646f44fa749338633b5fb0f250b5be1 (patch) | |
| tree | 267f6992d8c957e8871ef2a06615de36b487f987 /odk | |
| parent | 1efb6f63dfc99236960fa2f691c621e1ff66a029 (diff) | |
#87796# change for new settings.mk
Diffstat (limited to 'odk')
| -rw-r--r-- | odk/examples/java/ConverterServlet/Makefile | 52 |
1 files changed, 8 insertions, 44 deletions
diff --git a/odk/examples/java/ConverterServlet/Makefile b/odk/examples/java/ConverterServlet/Makefile index 6c0bb239d461..5ef43e06a5df 100644 --- a/odk/examples/java/ConverterServlet/Makefile +++ b/odk/examples/java/ConverterServlet/Makefile @@ -3,51 +3,15 @@ PRJ=..$(PS)..$(PS).. SETTINGS=../../../settings -# Include settings makefile depending on platform/compiler -ifeq "$(MAKECMDGOALS)" "win_microcxx" - -include $(SETTINGS)/win_microcxx_settings.mk -ifndef PS -$(error Platform/Compiler settings file not found) -endif - SHAREDLIB_OUT=$(OUT_BIN) -endif -ifeq "$(MAKECMDGOALS)" "solaris_workshopcxx" - -include $(SETTINGS)/solaris_workshopcxx_settings.mk -ifndef PS -$(error Platform/Compiler settings file not found) -endif - SHAREDLIB_OUT=$(OUT_LIB) -endif -ifeq "$(MAKECMDGOALS)" "linux_gcc" - -include $(SETTINGS)/linux_gcc_settings.mk -ifndef PS -$(error Platform/Compiler settings file not found) -endif - SHAREDLIB_OUT=$(OUT_LIB) -endif - -# Define non-platform/compiler specific settings +include $(SETTINGS)/settings.mk include $(SETTINGS)/dk.mk include $(SETTINGS)/std.mk # Define non-platform/compiler specific settings - -# Targets -.PHONY: ALL -ALL : - @echo ------------------------------------------------------------- - @echo You must supply a target where TARGET is one of the following: - @echo - @echo win_microcxx : Windows using Microsoft C++ compiler/linker - @echo solaris_workshopcxx : Solaris using Sun Workshop C++ compiler - @echo linux_gcc : Linux using gcc - @echo ------------------------------------------------------------- - JAVAFILES = \ ConverterServlet.java \ - CLASSFILES = $(patsubst %.java,$(OUT_CLASS)$(PS)%.class,$(JAVAFILES) ) @@ -62,17 +26,17 @@ DK_CLASSPATH = $(subst $(EMPTYSTRING) $(EMPTYSTRING),, \ $(PATH_SEPARATOR)$(OUT_CLASS) \ ) -win_microcxx : $(CLASSFILES) - -solaris_workshopcxx : $(CLASSFILES) -linux_gcc : $(CLASSFILES) +# Targets +.PHONY: ALL +ALL : converterservlet include $(SETTINGS)/stdtarget.mk $(CLASSFILES) : $(OUT) $(OUT_CLASS) $(JAVAFILES) javac -classpath $(DK_CLASSPATH) -d $(OUT_CLASS) $(JAVAFILES) - @echo ---- - @echo Please make the resulting class to your web server - @echo ---- +converterservlet: $(CLASSFILES) + @echo -------------------------------------------------------------------------------- + @echo Please make the resulting class to your web server + @echo -------------------------------------------------------------------------------- |