# HG changeset patch
# User Tuomo Valkonen <tuomov@iki.fi>
# Date 1154639354 -7200
# Node ID c00694dbcde81816d6e9b3b45f6650ce8edbef68
# Parent  50525dab6c8e681e067b04257f0948a53130d204
Updated locations of *.mk.

diff -r 50525dab6c8e -r c00694dbcde8 Makefile
--- a/Makefile	Sat Jan 07 22:01:54 2006 +0100
+++ b/Makefile	Thu Aug 03 23:09:14 2006 +0200
@@ -4,7 +4,7 @@
 
 # System-specific configuration is in system.mk
 TOPDIR=.
-include system-inc.mk
+include build/system-inc.mk
 
 ######################################
 
@@ -30,7 +30,7 @@
 
 ######################################
 
-include $(TOPDIR)/rules.mk
+include $(TOPDIR)/build/rules.mk
 
 ######################################
 
diff -r 50525dab6c8e -r c00694dbcde8 build/rules.mk
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/build/rules.mk	Thu Aug 03 23:09:14 2006 +0200
@@ -0,0 +1,194 @@
+##
+## Some make rules
+##
+
+ifdef MODULE
+ifeq ($(PRELOAD_MODULES),1)
+MODULE_TARGETS := $(MODULE).a $(MODULE).lc
+else
+MODULE_TARGETS := $(MODULE).so $(MODULE).lc
+endif
+TARGETS := $(TARGETS) $(MODULE_TARGETS)
+endif
+
+ifdef LUA_SOURCES
+LUA_COMPILED := $(subst .lua,.lc, $(LUA_SOURCES))
+TARGETS := $(TARGETS) $(LUA_COMPILED)
+endif
+
+
+# Main targets
+######################################
+
+.PHONY: subdirs
+.PHONY: subdirs-clean
+.PHONY: subdirs-realclean
+.PHONY: subdirs-depend
+.PHONY: subdirs-install
+.PHONY: _install
+.PHONY: _depend
+
+all: subdirs $(TARGETS)
+
+clean: subdirs-clean _clean
+
+realclean: subdirs-realclean _clean _realclean
+
+depend: subdirs-depend _depend
+
+install: subdirs-install _install
+
+
+# Exports
+######################################
+
+ifdef MAKE_EXPORTS
+
+TO_CLEAN := $(TO_CLEAN) exports.c
+
+EXPORTS_C = exports.c
+
+exports.c: $(SOURCES)
+	$(MKEXPORTS) -module $(MAKE_EXPORTS) -o exports.c $(SOURCES)
+
+else # !MAKE_EXPORTS
+
+EXPORTS_C = 
+
+endif # !MAKE_EXPORTS
+
+
+# Compilation and linking
+######################################
+
+OBJS=$(subst .c,.o,$(SOURCES) $(EXPORTS_C))
+
+ifdef MODULE
+
+ifneq ($(PRELOAD_MODULES),1)
+
+CC_PICFLAGS=-fPIC -DPIC
+LD_SHAREDFLAGS=-shared
+
+%.o: %.c
+	$(CC) $(CC_PICFLAGS) $(CFLAGS) -c $< -o $@
+
+$(MODULE).so: $(OBJS) $(EXT_OBJS)
+	$(CC) $(LD_SHAREDFLAGS) $(LDFLAGS) $(OBJS) $(EXT_OBJS) -o $@
+
+
+module_install: module_stub_install
+	$(INSTALLDIR) $(MODULEDIR)
+	$(INSTALL) -m $(BIN_MODE) $(MODULE).so $(MODULEDIR)
+
+else # PRELOAD_MODULES
+
+PICOPT=-fPIC -DPIC
+LINKOPT=-shared
+
+%.o: %.c
+	$(CC) $(CFLAGS) -c $< -o $@
+
+$(MODULE).a: $(OBJS) $(EXT_OBJS)
+	$(AR) $(ARFLAGS) $@ $+
+	$(RANLIB) $@
+
+module_install: module_stub_install
+
+endif # PRELOAD_MODULES
+
+module_stub_install:
+	$(INSTALLDIR) $(LCDIR)
+	$(INSTALL) -m $(DATA_MODE) $(MODULE).lc $(LCDIR)
+
+ifndef MODULE_STUB
+
+$(MODULE).lc:
+	echo "ioncore.load_module('$(MODULE)')" | $(LUAC) -o $@ -
+else
+
+LUA_SOURCES += $(MODULE_STUB)
+
+endif #MODULE_STUB
+
+else # !MODULE
+
+
+%.o: %.c
+	$(CC) $(CFLAGS) -c $< -o $@
+
+
+endif# !MODULE
+
+
+# Clean rules
+######################################
+
+_clean:
+	$(RM) -f $(TO_CLEAN) core $(DEPEND_FILE) $(OBJS)
+
+_realclean:
+	$(RM) -f $(TO_REALCLEAN) $(TARGETS)
+
+# Lua rules
+######################################
+
+%.lc: %.lua
+	$(LUAC) -o $@ $<
+
+lc_install:
+	$(INSTALLDIR) $(LCDIR)
+	for i in $(LUA_COMPILED); do \
+		$(INSTALL) -m $(DATA_MODE) $$i $(LCDIR); \
+	done
+
+etc_install:
+	$(INSTALLDIR) $(ETCDIR)
+	for i in $(ETC); do \
+		$(INSTALL) -m $(DATA_MODE) $$i $(ETCDIR); \
+	done
+
+# Dependencies
+######################################
+
+ifdef SOURCES
+
+_depend: $(DEPEND_DEPENDS)
+	$(MAKE_DEPEND)
+
+ifeq ($(DEPEND_FILE),$(wildcard $(DEPEND_FILE)))
+include $(DEPEND_FILE)
+endif
+
+endif
+
+# Subdirectories
+######################################
+
+ifdef SUBDIRS
+
+subdirs:
+	set -e; for i in $(SUBDIRS); do $(MAKE) -C $$i; done
+
+subdirs-depend:
+	set -e; for i in $(SUBDIRS); do $(MAKE) -C $$i depend; done
+
+subdirs-clean:
+	set -e; for i in $(SUBDIRS); do $(MAKE) -C $$i clean; done
+
+subdirs-realclean:
+	set -e; for i in $(SUBDIRS); do $(MAKE) -C $$i realclean; done
+
+subdirs-install:
+	set -e; for i in $(INSTALL_SUBDIRS); do $(MAKE) -C $$i install; done
+
+endif
+
+# Localisation
+######################################
+
+TO_CLEAN += potfiles_c potfiles_lua
+
+_potfiles:
+	echo "$(SOURCES)"|tr ' ' '\n' > potfiles_c
+	echo "$(LUA_SOURCES) $(ETC)"|tr ' ' '\n' > potfiles_lua
diff -r 50525dab6c8e -r c00694dbcde8 build/system-inc.mk
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/build/system-inc.mk	Thu Aug 03 23:09:14 2006 +0200
@@ -0,0 +1,17 @@
+# Use system-ac.mk if it exist, system.mk otherwise.
+
+ifndef TOPDIR
+  TOPDIR=.
+endif
+
+SYSTEM_MK = $(TOPDIR)/system.mk
+AC_SYSTEM_MK = $(TOPDIR)/build/ac/system-ac.mk
+
+ifeq ($(AC_SYSTEM_MK),$(wildcard $(AC_SYSTEM_MK)))
+  # Using system-ac.mk
+  include $(AC_SYSTEM_MK)
+else
+  # Not using system-ac.mk
+  include $(SYSTEM_MK)
+endif
+
diff -r 50525dab6c8e -r c00694dbcde8 rules.mk
--- a/rules.mk	Sat Jan 07 22:01:54 2006 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,194 +0,0 @@
-##
-## Some make rules
-##
-
-ifdef MODULE
-ifeq ($(PRELOAD_MODULES),1)
-MODULE_TARGETS := $(MODULE).a $(MODULE).lc
-else
-MODULE_TARGETS := $(MODULE).so $(MODULE).lc
-endif
-TARGETS := $(TARGETS) $(MODULE_TARGETS)
-endif
-
-ifdef LUA_SOURCES
-LUA_COMPILED := $(subst .lua,.lc, $(LUA_SOURCES))
-TARGETS := $(TARGETS) $(LUA_COMPILED)
-endif
-
-
-# Main targets
-######################################
-
-.PHONY: subdirs
-.PHONY: subdirs-clean
-.PHONY: subdirs-realclean
-.PHONY: subdirs-depend
-.PHONY: subdirs-install
-.PHONY: _install
-.PHONY: _depend
-
-all: subdirs $(TARGETS)
-
-clean: subdirs-clean _clean
-
-realclean: subdirs-realclean _clean _realclean
-
-depend: subdirs-depend _depend
-
-install: subdirs-install _install
-
-
-# Exports
-######################################
-
-ifdef MAKE_EXPORTS
-
-TO_CLEAN := $(TO_CLEAN) exports.c
-
-EXPORTS_C = exports.c
-
-exports.c: $(SOURCES)
-	$(MKEXPORTS) -module $(MAKE_EXPORTS) -o exports.c $(SOURCES)
-
-else # !MAKE_EXPORTS
-
-EXPORTS_C = 
-
-endif # !MAKE_EXPORTS
-
-
-# Compilation and linking
-######################################
-
-OBJS=$(subst .c,.o,$(SOURCES) $(EXPORTS_C))
-
-ifdef MODULE
-
-ifneq ($(PRELOAD_MODULES),1)
-
-CC_PICFLAGS=-fPIC -DPIC
-LD_SHAREDFLAGS=-shared
-
-%.o: %.c
-	$(CC) $(CC_PICFLAGS) $(CFLAGS) -c $< -o $@
-
-$(MODULE).so: $(OBJS) $(EXT_OBJS)
-	$(CC) $(LD_SHAREDFLAGS) $(LDFLAGS) $(OBJS) $(EXT_OBJS) -o $@
-
-
-module_install: module_stub_install
-	$(INSTALLDIR) $(MODULEDIR)
-	$(INSTALL) -m $(BIN_MODE) $(MODULE).so $(MODULEDIR)
-
-else # PRELOAD_MODULES
-
-PICOPT=-fPIC -DPIC
-LINKOPT=-shared
-
-%.o: %.c
-	$(CC) $(CFLAGS) -c $< -o $@
-
-$(MODULE).a: $(OBJS) $(EXT_OBJS)
-	$(AR) $(ARFLAGS) $@ $+
-	$(RANLIB) $@
-
-module_install: module_stub_install
-
-endif # PRELOAD_MODULES
-
-module_stub_install:
-	$(INSTALLDIR) $(LCDIR)
-	$(INSTALL) -m $(DATA_MODE) $(MODULE).lc $(LCDIR)
-
-ifndef MODULE_STUB
-
-$(MODULE).lc:
-	echo "ioncore.load_module('$(MODULE)')" | $(LUAC) -o $@ -
-else
-
-LUA_SOURCES += $(MODULE_STUB)
-
-endif #MODULE_STUB
-
-else # !MODULE
-
-
-%.o: %.c
-	$(CC) $(CFLAGS) -c $< -o $@
-
-
-endif# !MODULE
-
-
-# Clean rules
-######################################
-
-_clean:
-	$(RM) -f $(TO_CLEAN) core $(DEPEND_FILE) $(OBJS)
-
-_realclean:
-	$(RM) -f $(TO_REALCLEAN) $(TARGETS)
-
-# Lua rules
-######################################
-
-%.lc: %.lua
-	$(LUAC) -o $@ $<
-
-lc_install:
-	$(INSTALLDIR) $(LCDIR)
-	for i in $(LUA_COMPILED); do \
-		$(INSTALL) -m $(DATA_MODE) $$i $(LCDIR); \
-	done
-
-etc_install:
-	$(INSTALLDIR) $(ETCDIR)
-	for i in $(ETC); do \
-		$(INSTALL) -m $(DATA_MODE) $$i $(ETCDIR); \
-	done
-
-# Dependencies
-######################################
-
-ifdef SOURCES
-
-_depend: $(DEPEND_DEPENDS)
-	$(MAKE_DEPEND)
-
-ifeq ($(DEPEND_FILE),$(wildcard $(DEPEND_FILE)))
-include $(DEPEND_FILE)
-endif
-
-endif
-
-# Subdirectories
-######################################
-
-ifdef SUBDIRS
-
-subdirs:
-	set -e; for i in $(SUBDIRS); do $(MAKE) -C $$i; done
-
-subdirs-depend:
-	set -e; for i in $(SUBDIRS); do $(MAKE) -C $$i depend; done
-
-subdirs-clean:
-	set -e; for i in $(SUBDIRS); do $(MAKE) -C $$i clean; done
-
-subdirs-realclean:
-	set -e; for i in $(SUBDIRS); do $(MAKE) -C $$i realclean; done
-
-subdirs-install:
-	set -e; for i in $(INSTALL_SUBDIRS); do $(MAKE) -C $$i install; done
-
-endif
-
-# Localisation
-######################################
-
-TO_CLEAN += potfiles_c potfiles_lua
-
-_potfiles:
-	echo "$(SOURCES)"|tr ' ' '\n' > potfiles_c
-	echo "$(LUA_SOURCES) $(ETC)"|tr ' ' '\n' > potfiles_lua
diff -r 50525dab6c8e -r c00694dbcde8 system-inc.mk
--- a/system-inc.mk	Sat Jan 07 22:01:54 2006 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,14 +0,0 @@
-# Use system-ac.mk if it exist, system.mk otherwise.
-
-ifndef TOPDIR
-  TOPDIR=.
-endif
-
-ifeq ($(TOPDIR)/system-ac.mk,$(wildcard $(TOPDIR)/system-ac.mk))
-  # Using system-ac.mk
-  include $(TOPDIR)/system-ac.mk
-else
-  # Not using system-ac.mk
-  include $(TOPDIR)/system.mk
-endif
-