diff -up alleggl/make/makefile.all~ alleggl/make/makefile.all
--- alleggl/make/makefile.all~ 2007-01-06 21:39:09.000000000 +0100
+++ alleggl/make/makefile.all 2010-09-10 09:14:33.192573997 +0200
@@ -47,7 +47,6 @@ ifeq ($(DATA_INSTALLER),)
PROG_INSTALLER=cp
endif
-install: $(LIB_PATH_U) $(HEADERS_U) $(EXT_HEADERS_U)
ifdef UNIX_TOOLS
define CP_INSTALL
$(foreach file, $(HEADERS_U), - $(DATA_INSTALLER) $(file) $(subst include,$(COMPILER_INCLUDE_DIR_U),$(file))
@@ -59,6 +58,31 @@ ifdef UNIX_TOOLS
$(foreach link, $(LIB_LINKS_U), - ln -sf $(notdir $(LIB_PATH_U)) $(subst $(LIB_DIR),$(COMPILER_LIB_DIR_U),$(link))
)
endef
+ define RM_UNINSTALL
+ $(foreach link, $(LIB_LINKS_U), - rm -f $(subst $(LIB_DIR),$(COMPILER_LIB_DIR_U),$(link))
+ )
+ $(foreach file, $(HEADERS_U), - rm -f $(subst include,$(COMPILER_INCLUDE_DIR_U),$(file))
+ )
+ $(foreach file, $(EXT_HEADERS_U), - rm -f $(subst include,$(COMPILER_INCLUDE_DIR_U),$(file))
+ )
+ endef
+else
+ define CP_INSTALL
+ $(foreach file, $(HEADERS_D), - copy /y $(file) $(subst include,$(COMPILER_INCLUDE_DIR_D),$(file))
+ )
+ $(foreach file, $(EXT_HEADERS_D), - copy /y $(file) $(subst include,$(COMPILER_INCLUDE_DIR_D),$(file))
+ )
+ endef
+ define RM_UNINSTALL
+ $(foreach file, $(notdir $(HEADERS_D)), - del $(COMPILER_INCLUDE_DIR_D)\$(file)
+ )
+ $(foreach file, $(notdir $(EXT_HEADERS_D)), - del $(COMPILER_INCLUDE_DIR_D)\$(file)
+ )
+ endef
+endif
+
+install: $(LIB_PATH_U) $(HEADERS_U) $(EXT_HEADERS_U)
+ifdef UNIX_TOOLS
ifeq ($(wildcard $(COMPILER_INCLUDE_DIR_U)/allegrogl),)
mkdir -p $(COMPILER_INCLUDE_DIR_U)/allegrogl
endif
@@ -73,12 +97,6 @@ ifdef UNIX_TOOLS
- $(INSTALL_LINK)
- $(LDCONFIG)
else
- define CP_INSTALL
- $(foreach file, $(HEADERS_D), - copy /y $(file) $(subst include,$(COMPILER_INCLUDE_DIR_D),$(file))
- )
- $(foreach file, $(EXT_HEADERS_D), - copy /y $(file) $(subst include,$(COMPILER_INCLUDE_DIR_D),$(file))
- )
- endef
- mkdir $(COMPILER_INCLUDE_DIR_D)\allegrogl
- mkdir $(COMPILER_INCLUDE_DIR_D)\allegrogl\GLext
- $(CP_INSTALL)
@@ -89,25 +107,11 @@ endif
uninstall:
ifdef UNIX_TOOLS
- define RM_UNINSTALL
- $(foreach link, $(LIB_LINKS_U), - rm -f $(subst $(LIB_DIR),$(COMPILER_LIB_DIR_U),$(link))
- )
- $(foreach file, $(HEADERS_U), - rm -f $(subst include,$(COMPILER_INCLUDE_DIR_U),$(file))
- )
- $(foreach file, $(EXT_HEADERS_U), - rm -f $(subst include,$(COMPILER_INCLUDE_DIR_U),$(file))
- )
- endef
- rm -f $(COMPILER_LIB_DIR_U)/$(notdir $(LIB_PATH_U))
- $(RM_UNINSTALL)
- rm -rf $(COMPILER_INCLUDE_DIR_U)/allegrogl/GLext
- rm -rf $(COMPILER_INCLUDE_DIR_U)/allegrogl
else
- define RM_UNINSTALL
- $(foreach file, $(notdir $(HEADERS_D)), - del $(COMPILER_INCLUDE_DIR_D)\$(file)
- )
- $(foreach file, $(notdir $(EXT_HEADERS_D)), - del $(COMPILER_INCLUDE_DIR_D)\$(file)
- )
- endef
- $(RM_UNINSTALL)
- rmdir /s /q $(COMPILER_INCLUDE_DIR_D)\allegrogl
- del $(COMPILER_LIB_DIR_D)\$(notdir $(LIB_PATH_U))
diff -up alleggl/make/makefile.unx~ alleggl/make/makefile.unx
--- alleggl/make/makefile.unx~ 2007-11-10 20:33:06.000000000 +0100
+++ alleggl/make/makefile.unx 2010-09-10 09:24:30.423574002 +0200
@@ -149,11 +149,12 @@ distlist:
include make/makefile.dep
-$(LIB_PATH_U): $(GENERAL_LIB_OBJS) $(PLATFORM_OBJECT)
define MAKE_LINKS
$(foreach link, $(LIB_LINKS_U), - ln -sf $(notdir $(LIB_PATH_U)) $(link)
)
endef
+
+$(LIB_PATH_U): $(GENERAL_LIB_OBJS) $(PLATFORM_OBJECT)
$(LIB_BUILDER) $@ $^
- $(MAKE_LINKS)