diff -c5 orig/build.make new/build.make
*** orig/build.make	Mon Nov 17 22:28:01 1997
--- new/build.make	Fri Oct 24 02:09:22 1997
***************
*** 67,85 ****
  
  #
  # Compile java code
  #
  
  ifeq "$(JAVA_ENABLED)" "YES"
! 
! build-java-classes: $(JAVA_SRC_DIR) $(JAVA_OBJ_DIR)
! 	$(JAVATOOL) $(JAVAC_ARG) $(OTHER_JAVATOOL_FLAGS) -newer -build -java_src $(JAVA_SRC_DIR) -java_obj $(JAVA_OBJ_DIR) $(JAVA_CLASSES)
! 
! else
! 
! build-java-classes:
! 
  endif
  
  #
  # Copying local resources
  #
--- 67,79 ----
  
  #
  # Compile java code
  #
  
+ build-java-classes: 
  ifeq "$(JAVA_ENABLED)" "YES"
! 	$(JAVATOOL) $(OTHER_JAVATOOL_FLAGS) $(JAVAC_ARG) -newer -build -java_src $(JAVA_SRC_DIR) -java_obj $(JAVA_OBJ_DIR) $(JAVA_CLASSES)
  endif
  
  #
  # Copying local resources
  #
***************
*** 124,153 ****
  #
  # DEF-file generation (used on Windows only)
  #
  
  ifeq "WINDOWS" "$(OS)"
- TMPFILE = $(OFILE_DIR)/nmtmpfile
- GENERATED_DEF_FILE = $(SFILE_DIR)/$(WINDOWS_DEF_FILE)
  
! ifneq "$(ENABLE_DEF_FILE_GENERATION)" "NO"
! $(WINDOWS_DEF_FILE): $(OFILELISTS) $(OFILES)
! 	$(SILENT) if [ ! -r "./$(WINDOWS_DEF_FILE)" ] ; then \
! 		$(ECHO) -n "Generating $(notdir $@)...." ; \
! 		(cd $(OFILE_DIR); $(DUMP_SYMBOLS) $(OFILES) $(addprefix @,$(OFILELISTS)) | $(EGREP) "(SECT).*(External).*(\|)" | $(EGREP) -v "(__GLOBAL_$I)|(_OBJC_)" | $(SED) "s/ _/ /" > $(TMPFILE)) ; \
! 		$(ECHO) "LIBRARY $(NAME).dll" > $(GENERATED_DEF_FILE) ; \
! 		$(ECHO) "EXPORTS" >> $(GENERATED_DEF_FILE) ; \
! 		$(AWK) '$$3 == "SECT2" || $$NF ~ /^.objc_c/ {printf "\t%s CONSTANT\n", $$NF; next} $$3 == "SECT1" {printf "\t%s\n", $$NF}' $(TMPFILE) >> $(GENERATED_DEF_FILE) ; \
! 		$(ECHO) "done"; \
  	fi
  endif
  
  .PHONY: clean_deffile
  
  clean_deffile:
! 	$(RM) -f $(GENERATED_DEF_FILE)
! endif
  
  
  #
  # Rules for creating directories
  #
--- 118,154 ----
  #
  # DEF-file generation (used on Windows only)
  #
  
  ifeq "WINDOWS" "$(OS)"
  
! BUILD_DEF_FILE_COMMAND = $(PERL) $(OMNIMAKE_ROOT)/utilities/winnt/generateDefFile.perl
! GENERATED_DEF_FILE     = $(SFILE_DIR)/$(WINDOWS_DEF_FILE)
! 
! 
! # What happens if you have OTHER_OFILES in subprojects??
! $(WINDOWS_DEF_FILE): $(OFILES) $(OTHER_OFILES)
! 	$(SILENT) if [ ! -r "./$(WINDOWS_DEF_FILE)" ] ; then			\
! 		(								\
! 			cd $(OFILE_DIR);					\
! 			if [ -r $(NAME).ofileList ]; then			\
! 				mainOFiles="$(OFILES) @$(NAME).ofileList" ;	\
! 			else							\
! 				mainOFiles="$(OFILES)" ;			\
! 			fi;							\
! 			$(ECHO) ;						\
! 			$(ECHO) -n "Generating $(notdir $@) from $(OTHER_OFILES) $(OTHER_GENERATED_OFILES) $$mainOFiles ...." ; \
! 			$(BUILD_DEF_FILE_COMMAND) $(notdir $(PRODUCT)) $(OTHER_OFILES) $(OTHER_GENERATED_OFILES) $$mainOFiles > $(GENERATED_DEF_FILE); \
! 			$(ECHO) "done"; 					\
! 		) ; 								\
  	fi
  endif
  
  .PHONY: clean_deffile
  
  clean_deffile:
! 	$(RM) -f $(WINDOWS_DEF_FILE)
  
  
  #
  # Rules for creating directories
  #
diff -c5 orig/framework.make new/framework.make
*** orig/framework.make	Mon Nov 17 22:27:53 1997
--- new/framework.make	Mon Nov  3 22:00:06 1997
***************
*** 50,61 ****
  RECURSIVE_FLAGS += PUBLIC_HDR_DIR=$(PUBLIC_HDR_DIR)
  RECURSIVE_FLAGS += PRIVATE_HDR_DIR=$(PRIVATE_HDR_DIR)
  
  $(PRODUCT): $(INNER_PRODUCT)
  
  $(INNER_PRODUCT): $(DEPENDENCIES) $(WINDOWS_DEF_FILE)
! 	$(LIBTOOL) $(ALL_LIBTOOL_FLAGS) -o $(INNER_PRODUCT) $(LOADABLES)
  
  ifndef FRAMEWORK_DLL_INSTALLDIR
  FRAMEWORK_DLL_INSTALLDIR = $(INSTALLDIR)/../Executables
  endif
  
--- 50,66 ----
  RECURSIVE_FLAGS += PUBLIC_HDR_DIR=$(PUBLIC_HDR_DIR)
  RECURSIVE_FLAGS += PRIVATE_HDR_DIR=$(PRIVATE_HDR_DIR)
  
  $(PRODUCT): $(INNER_PRODUCT)
  
+ # TJW (Omni) -- If the LIB environment variable is set, the linker won't find dllmain.o.
+ # Pretty weird if you ask me.
  $(INNER_PRODUCT): $(DEPENDENCIES) $(WINDOWS_DEF_FILE)
! 	$(SILENT) ( \
! 	unset LIB; \
! 	$(LIBTOOL) $(filter-out -g, $(ALL_LDFLAGS)) -o $(INNER_PRODUCT) $(LOADABLES); \
! 	)
  
  ifndef FRAMEWORK_DLL_INSTALLDIR
  FRAMEWORK_DLL_INSTALLDIR = $(INSTALLDIR)/../Executables
  endif
  
diff -c5 orig/prebuild.make new/prebuild.make
*** orig/prebuild.make	Mon Nov 17 22:27:56 1997
--- new/prebuild.make	Fri Oct 24 02:09:22 1997
***************
*** 78,102 ****
  
  #
  # if there are any project headers we must export them
  #
  
- ifneq "" "$(PROJECT_HEADERS)$(OTHER_PROJECT_HEADERS)"
  export-project-headers: $(PROJECT_HDR_DIR)$(PROJECT_HEADER_DIR_SUFFIX) $(PROJECT_HEADERS) $(OTHER_PROJECT_HEADERS)
! 	$(SILENT) $(CLONEHDRS) $(PROJECT_HEADERS) $(OTHER_PROJECT_HEADERS) $(PROJECT_HDR_DIR)$(PROJECT_HEADER_DIR_SUFFIX)
! endif
  
  #
  # if there are any public headers we must export them
  #
  
- ifneq "" "$(PUBLIC_HEADERS)$(OTHER_PUBLIC_HEADERS)"
- ifneq "" "$(PUBLIC_HDR_DIR)"
  export-public-headers: $(PUBLIC_HDR_DIR)$(PUBLIC_HEADER_DIR_SUFFIX) $(PUBLIC_HEADERS) $(OTHER_PUBLIC_HEADERS)
! 	$(SILENT) $(CLONEHDRS) $(PUBLIC_HEADERS) $(OTHER_PUBLIC_HEADERS) $(PUBLIC_HDR_DIR)$(PUBLIC_HEADER_DIR_SUFFIX)
! endif
! endif
  
  #
  # if there are any private headers we must export them
  #
  
--- 78,102 ----
  
  #
  # if there are any project headers we must export them
  #
  
  export-project-headers: $(PROJECT_HDR_DIR)$(PROJECT_HEADER_DIR_SUFFIX) $(PROJECT_HEADERS) $(OTHER_PROJECT_HEADERS)
! 	$(SILENT) if [ -n "$(PROJECT_HEADERS)$(OTHER_PROJECT_HEADERS)" ]; then \
! 		$(CLONEHDRS) $(PROJECT_HEADERS) $(OTHER_PROJECT_HEADERS) $(PROJECT_HDR_DIR)$(PROJECT_HEADER_DIR_SUFFIX); \
! 	fi
  
  #
  # if there are any public headers we must export them
  #
  
  export-public-headers: $(PUBLIC_HDR_DIR)$(PUBLIC_HEADER_DIR_SUFFIX) $(PUBLIC_HEADERS) $(OTHER_PUBLIC_HEADERS)
! 	$(SILENT) if [ -n "$(PUBLIC_HEADERS)$(OTHER_PUBLIC_HEADERS)" ]; then \
! 		if [ -n "$(PUBLIC_HDR_DIR)" ]; then \
! 			$(CLONEHDRS) $(PUBLIC_HEADERS) $(OTHER_PUBLIC_HEADERS) $(PUBLIC_HDR_DIR)$(PUBLIC_HEADER_DIR_SUFFIX); \
! 		fi; \
! 	fi
  
  #
  # if there are any private headers we must export them
  #
  
