X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=Makefile;h=bdd285b5e775938c501bd4dd53fd57723470f574;hb=ddaae9de458b7f07b05461101655a1da4c63b380;hp=03809fd4fdbd61d1c04bf8171ef64033fe5cf955;hpb=8d93b043cc23f5a580363763ad459913127a8664;p=rocksndiamonds.git

diff --git a/Makefile b/Makefile
index 03809fd4..bdd285b5 100644
--- a/Makefile
+++ b/Makefile
@@ -49,8 +49,8 @@ CROSS_PATH_WIN32=/usr/local/cross-tools/i386-mingw32msvc
 SRC_DIR = src
 MAKE_CMD = $(MAKE) -C $(SRC_DIR)
 
-# DEFAULT_TARGET = x11
-DEFAULT_TARGET = sdl
+DEFAULT_TARGET = x11
+# DEFAULT_TARGET = sdl
 
 all:
 	@$(MAKE_CMD) TARGET=$(DEFAULT_TARGET)
@@ -88,11 +88,7 @@ clean:
 #-----------------------------------------------------------------------------#
 
 auto-conf:
-	./Scripts/create_element_defs.pl --graphics > src/conf_gfx.h
-	./Scripts/create_element_defs.pl --sounds   > src/conf_snd.h
-	./Scripts/create_element_defs.pl --chars    > src/conf_chr.c
-	./Scripts/create_element_defs.pl --custom   > src/conf_cus.c
-	./Scripts/create_element_defs.pl --el2gfx   > src/conf_e2g.c
+	@$(MAKE_CMD) auto-conf
 
 run:
 	@$(MAKE_CMD) TARGET=$(DEFAULT_TARGET) && ./rocksndiamonds --verbose
@@ -142,11 +138,20 @@ upload-macosx:
 dist-clean:
 	@$(MAKE_CMD) dist-clean
 
+dist-build-unix:
+	@BUILD_DIST=TRUE $(MAKE) x11
+
+dist-build-win32:
+	@BUILD_DIST=TRUE $(MAKE) cross-win32
+
+dist-build-msdos:
+	@BUILD_DIST=TRUE $(MAKE) cross-msdos
+
 dist-build-all:
 	$(MAKE) clean
-	@BUILD_DIST=TRUE $(MAKE) x11		; $(MAKE) dist-clean
-	@BUILD_DIST=TRUE $(MAKE) cross-win32	; $(MAKE) dist-clean
-	@BUILD_DIST=TRUE $(MAKE) cross-msdos	; $(MAKE) dist-clean
+	$(MAKE) dist-build-unix		; $(MAKE) dist-clean
+	$(MAKE) dist-build-win32	; $(MAKE) dist-clean
+	$(MAKE) dist-build-msdos	; $(MAKE) dist-clean
 
 dist-all: dist-build-all dist-unix dist-msdos dist-win32 dist-macosx