From: johanengelen Date: Sun, 30 Mar 2008 17:40:29 +0000 (+0000) Subject: revert Makefile changes accidentally committed X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=c70a6d84419128aa7ff900821d0ac3e1b518be13;p=inkscape.git revert Makefile changes accidentally committed --- diff --git a/src/extension/dxf2svg/Makefile b/src/extension/dxf2svg/Makefile index 7a400d81c..d0f06daf0 100644 --- a/src/extension/dxf2svg/Makefile +++ b/src/extension/dxf2svg/Makefile @@ -1,107 +1,21 @@ -# CMAKE generated file: DO NOT EDIT! -# Generated by "MinGW Makefiles" Generator, CMake Version 2.4 - -# Default target executed when no arguments are given to make. -default_target: all - -#============================================================================= -# Special targets provided by cmake. - -# Disable implicit rules so canoncical targets will work. -.SUFFIXES: - -.SUFFIXES: .hpux_make_needs_suffix_list - -# Suppress display of executed commands. -$(VERBOSE).SILENT: - -# A target that is always out of date. -cmake_force: - -#============================================================================= -# Set environment variables for the build. - -SHELL = cmd.exe - -# The CMake executable. -CMAKE_COMMAND = "C:\Program Files\CMake 2.4\bin\cmake.exe" - -# The command to remove a file. -RM = "C:\Program Files\CMake 2.4\bin\cmake.exe" -E remove -f - -# The program to use to edit the cache. -CMAKE_EDIT_COMMAND = C:\PROGRA~1\CMAKE2~1.4\bin\CMAKES~1.EXE - -# The top-level source directory on which CMake was run. -CMAKE_SOURCE_DIR = C:\inkscape - -# The top-level build directory on which CMake was run. -CMAKE_BINARY_DIR = C:\inkscape - -# Include the progress variables for this target. -include CMakeFiles/progress.make - -#============================================================================= -# Targets provided globally by CMake. - -# Special rule for the target edit_cache -edit_cache: - @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Running CMake cache editor..." - cd C:\inkscape\src\extension\dxf2svg && "C:\Program Files\CMake 2.4\bin\CMakeSetup.exe" -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) - -# Special rule for the target edit_cache -edit_cache/fast: edit_cache - -# Special rule for the target rebuild_cache -rebuild_cache: - @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Running CMake to regenerate build system..." - cd C:\inkscape\src\extension\dxf2svg && "C:\Program Files\CMake 2.4\bin\cmake.exe" -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) - -# Special rule for the target rebuild_cache -rebuild_cache/fast: rebuild_cache - -# The main all target -all: cmake_check_build_system - cd C:\inkscape && $(CMAKE_COMMAND) -E cmake_progress_start C:\inkscape\CMakeFiles $(CMAKE_ALL_PROGRESS) - cd C:\inkscape && $(MAKE) -f CMakeFiles/Makefile2 src/extension/dxf2svg/all - $(CMAKE_COMMAND) -E cmake_progress_start C:\inkscape\CMakeFiles 0 - -# The main clean target -clean: - cd C:\inkscape && $(MAKE) -f CMakeFiles/Makefile2 src/extension/dxf2svg/clean - -# The main clean target -clean/fast: clean - -# Prepare targets for installation. -preinstall: all - cd C:\inkscape && $(MAKE) -f CMakeFiles/Makefile2 src/extension/dxf2svg/preinstall - -# Prepare targets for installation. -preinstall/fast: - cd C:\inkscape && $(MAKE) -f CMakeFiles/Makefile2 src/extension/dxf2svg/preinstall - -# clear depends -depend: - $(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles\Makefile.cmake 1 - -# Help Target -help:: - @$(CMAKE_COMMAND) -E echo "The following are some of the valid targets for this Makefile:" - @$(CMAKE_COMMAND) -E echo "... all (the default if no target is provided)" - @$(CMAKE_COMMAND) -E echo "... clean" - @$(CMAKE_COMMAND) -E echo "... depend" - @$(CMAKE_COMMAND) -E echo "... edit_cache" - @$(CMAKE_COMMAND) -E echo "... rebuild_cache" - - - -#============================================================================= -# Special targets to cleanup operation of make. - -# Special rule to run CMake to check the build system integrity. -# No rule that depends on this can have commands that come from listfiles -# because they might be regenerated. -cmake_check_build_system: - cd C:\inkscape && $(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles\Makefile.cmake 0 - +objs = read_dxf.o entities.o entities2elements.o tables.o tables2svg_info.o blocks.o +flags = -O1 + +dxf2svg : dxf2svg.cpp $(objs) + g++ $(flags) -o dxf2svg dxf2svg.cpp $(objs) + +test : test_dxf.cpp $(objs) + g++ $(flags) -o test test_dxf.cpp $(objs) + +%.o : %.cpp %.h + g++ $(flags) -c $< + +clean : + rm dxf2svg $(objs) + +install: + echo ****User intervention required**** + echo + echo Copy dxf2svg executable and dxf2svg.inx to share/extension directory + echo Make sure file permissions are set correctly + diff --git a/src/graphlayout/makefile b/src/graphlayout/makefile index 27a0313cc..5d8ac906e 100644 --- a/src/graphlayout/makefile +++ b/src/graphlayout/makefile @@ -1,107 +1,17 @@ -# CMAKE generated file: DO NOT EDIT! -# Generated by "MinGW Makefiles" Generator, CMake Version 2.4 - -# Default target executed when no arguments are given to make. -default_target: all - -#============================================================================= -# Special targets provided by cmake. - -# Disable implicit rules so canoncical targets will work. -.SUFFIXES: - -.SUFFIXES: .hpux_make_needs_suffix_list - -# Suppress display of executed commands. -$(VERBOSE).SILENT: - -# A target that is always out of date. -cmake_force: - -#============================================================================= -# Set environment variables for the build. - -SHELL = cmd.exe - -# The CMake executable. -CMAKE_COMMAND = "C:\Program Files\CMake 2.4\bin\cmake.exe" - -# The command to remove a file. -RM = "C:\Program Files\CMake 2.4\bin\cmake.exe" -E remove -f - -# The program to use to edit the cache. -CMAKE_EDIT_COMMAND = C:\PROGRA~1\CMAKE2~1.4\bin\CMAKES~1.EXE - -# The top-level source directory on which CMake was run. -CMAKE_SOURCE_DIR = C:\inkscape - -# The top-level build directory on which CMake was run. -CMAKE_BINARY_DIR = C:\inkscape - -# Include the progress variables for this target. -include CMakeFiles/progress.make - -#============================================================================= -# Targets provided globally by CMake. - -# Special rule for the target edit_cache -edit_cache: - @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Running CMake cache editor..." - cd C:\inkscape\src\graphlayout && "C:\Program Files\CMake 2.4\bin\CMakeSetup.exe" -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) - -# Special rule for the target edit_cache -edit_cache/fast: edit_cache - -# Special rule for the target rebuild_cache -rebuild_cache: - @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Running CMake to regenerate build system..." - cd C:\inkscape\src\graphlayout && "C:\Program Files\CMake 2.4\bin\cmake.exe" -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) - -# Special rule for the target rebuild_cache -rebuild_cache/fast: rebuild_cache - -# The main all target -all: cmake_check_build_system - cd C:\inkscape && $(CMAKE_COMMAND) -E cmake_progress_start C:\inkscape\CMakeFiles $(CMAKE_ALL_PROGRESS) - cd C:\inkscape && $(MAKE) -f CMakeFiles/Makefile2 src/graphlayout/all - $(CMAKE_COMMAND) -E cmake_progress_start C:\inkscape\CMakeFiles 0 - -# The main clean target -clean: - cd C:\inkscape && $(MAKE) -f CMakeFiles/Makefile2 src/graphlayout/clean - -# The main clean target -clean/fast: clean - -# Prepare targets for installation. -preinstall: all - cd C:\inkscape && $(MAKE) -f CMakeFiles/Makefile2 src/graphlayout/preinstall - -# Prepare targets for installation. -preinstall/fast: - cd C:\inkscape && $(MAKE) -f CMakeFiles/Makefile2 src/graphlayout/preinstall - -# clear depends -depend: - $(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles\Makefile.cmake 1 - -# Help Target -help:: - @$(CMAKE_COMMAND) -E echo "The following are some of the valid targets for this Makefile:" - @$(CMAKE_COMMAND) -E echo "... all (the default if no target is provided)" - @$(CMAKE_COMMAND) -E echo "... clean" - @$(CMAKE_COMMAND) -E echo "... depend" - @$(CMAKE_COMMAND) -E echo "... edit_cache" - @$(CMAKE_COMMAND) -E echo "... rebuild_cache" - - - -#============================================================================= -# Special targets to cleanup operation of make. - -# Special rule to run CMake to check the build system integrity. -# No rule that depends on this can have commands that come from listfiles -# because they might be regenerated. -cmake_check_build_system: - cd C:\inkscape && $(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles\Makefile.cmake 0 - +# Convenience stub makefile to call the real Makefile. + + + +# Explicit so that it's the default rule. +all: + cd .. && $(MAKE) graphlayout/all + +clean %.a %.o: + cd .. && $(MAKE) graphlayout/$@ + +.PHONY: all clean + +OBJEXT = o + +.SUFFIXES: +.SUFFIXES: .a .$(OBJEXT)