[Scummvm-cvs-logs] CVS: scummvm Makefile.common,1.69,1.70 common.rules,1.10,1.11

[Max Horn]

Update of /cvsroot/scummvm/scummvm
In directory sc8-pr-cvs1:/tmp/cvs-serv21522

Modified Files:
	Makefile.common common.rules 
Log Message:
some cleanup, and an (untested) loadable module build rule for Linux

Index: Makefile.common
===================================================================
RCS file: /cvsroot/scummvm/scummvm/Makefile.common,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -d -r1.69 -r1.70
--- Makefile.common	18 Sep 2003 18:23:51 -0000	1.69
+++ Makefile.common	19 Sep 2003 21:23:23 -0000	1.70
@@ -41,10 +41,21 @@
 PLUGIN_SUFFIX := .so
 
 ifdef BUILD_PLUGINS
-# FIXME/TODO: The following is OS X specific
-LDFLAGS += -all_load
+# TODO: The following stuff should be controlled by 'configure'
+
+# Define DYNAMIC_MODULES during building
 CXXFLAGS += -DDYNAMIC_MODULES
+
+# Uncomment these for Mac OS X
+#PLUGIN_LDFLAGS := -bundle -bundle_loader $(EXECUTABLE)
+#LDFLAGS += -all_load
+#LIBS += -ldl
+
+# Uncomment these for Linux
+CXXFLAGS += -fpic
+PLUGIN_LDFLAGS := -shared
 LIBS += -ldl
+
 endif
 
 ######################################################################
@@ -96,6 +107,10 @@
 # Include the build instructions for all modules
 -include $(addsuffix /module.mk,$(MODULES))
 
+# Depdir information
+DEPDIRS = $(addsuffix /$(DEPDIR),$(MODULE_DIRS))
+DEPFILES = 
+
 # Make main.o depend on all other object files. This way if anything is
 # changed, it causes main.cpp to be recompiled. This in turn ensures that
 # the build date in gScummVMBuildDate is correct.
@@ -105,14 +120,15 @@
 $(EXECUTABLE):  $(OBJS)
 	$(CXX) $(LDFLAGS) $+ $(LIBS) -o $@
 
+distclean: clean
+	$(RM_REC) $(DEPDIRS)
+	$(RM) build.rules config.h config.mak config.log
+
 clean:
 	$(RM) $(OBJS) $(EXECUTABLE)
 
 .PHONY: all clean dist distclean
 
-DEPDIRS = $(addsuffix /$(DEPDIR),$(MODULE_DIRS))
-DEPFILES = $(wildcard $(addsuffix /*.d,$(DEPDIRS)))
-
 # Old (dumb) compile & dependcy rules
 #INCS	= scumm/scumm.h common/scummsys.h common/stdafx.h
 #.cpp.o:
@@ -137,8 +153,7 @@
 	$(MKDIR) $(*D)/$(DEPDIR)
 	$(CXX) -Wp,-MMD,"$(*D)/$(DEPDIR)/$(*F).d",-MQ,"$@",-MP $(CXXFLAGS) $(CPPFLAGS) -c $(<) -o $*.o
 endif
--include $(DEPFILES) /dev/null
 
-distclean: clean
-	$(RM_REC) $(DEPDIRS)
-	$(RM) build.rules config.h config.mak config.log
+# Include the dependency tracking files. We add /dev/null at the end
+# of the list to avoid a warning/error if no .d file exist
+-include $(wildcard $(addsuffix /*.d,$(DEPDIRS))) /dev/null

Index: common.rules
===================================================================
RCS file: /cvsroot/scummvm/scummvm/common.rules,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- common.rules	18 Sep 2003 18:21:03 -0000	1.10
+++ common.rules	19 Sep 2003 21:23:23 -0000	1.11
@@ -10,7 +10,7 @@
 # one of several build rules
 PLUGIN-$(MODULE) := $(MODULE)/$(PLUGIN_PREFIX)$(MODULE)$(PLUGIN_SUFFIX)
 $(PLUGIN-$(MODULE)): $(MODULE_OBJS) $(EXECUTABLE)
-	$(CXX) -bundle -bundle_loader $(EXECUTABLE) $(filter-out $(EXECUTABLE),$+) $(LIBS) -o $@
+	$(CXX) $(PLUGIN_LDFLAGS) $(EXECUTABLE) $(filter-out $(EXECUTABLE),$+) $(LIBS) -o $@
 PLUGIN:=
 plugins: $(PLUGIN-$(MODULE))