diff options
| author | Krzysztof Kosi??ski <tweenk.pl@gmail.com> | 2010-03-14 23:58:16 +0000 |
|---|---|---|
| committer | Krzysztof Kosiński <tweenk.pl@gmail.com> | 2010-03-14 23:58:16 +0000 |
| commit | bf83d5a03bf856e34bd0a6e2656a5b2dcfe8aafb (patch) | |
| tree | 89db1a5074e284c958cf693302beaaafb086b702 /src/inkjar | |
| parent | Translations. Polish translation update. (diff) | |
| download | inkscape-bf83d5a03bf856e34bd0a6e2656a5b2dcfe8aafb.tar.gz inkscape-bf83d5a03bf856e34bd0a6e2656a5b2dcfe8aafb.zip | |
Move around files to remove some vanity directories.
Also remove the obsolete IDL file stub.
(bzr r9194)
Diffstat (limited to '')
| -rw-r--r-- | src/inkjar/CMakeLists.txt | 6 | ||||
| -rw-r--r-- | src/inkjar/Makefile_insert | 5 | ||||
| -rw-r--r-- | src/inkjar/makefile.in | 17 | ||||
| -rw-r--r-- | src/io/inkjar.cpp (renamed from src/inkjar/jar.cpp) | 2 | ||||
| -rw-r--r-- | src/io/inkjar.h (renamed from src/inkjar/jar.h) | 0 |
5 files changed, 1 insertions, 29 deletions
diff --git a/src/inkjar/CMakeLists.txt b/src/inkjar/CMakeLists.txt deleted file mode 100644 index 7a1e86525..000000000 --- a/src/inkjar/CMakeLists.txt +++ /dev/null @@ -1,6 +0,0 @@ -SET(inkjar_SRC -jar.cpp -) -ADD_LIBRARY(inkjar STATIC ${inkjar_SRC}) -TARGET_LINK_LIBRARIES(inkjar -2geom ${INKSCAPE_LIBS})
\ No newline at end of file diff --git a/src/inkjar/Makefile_insert b/src/inkjar/Makefile_insert deleted file mode 100644 index ef4f1fd19..000000000 --- a/src/inkjar/Makefile_insert +++ /dev/null @@ -1,5 +0,0 @@ -## Makefile.am fragment sourced by src/Makefile.am. - -ink_common_sources += \ - inkjar/jar.cpp \ - inkjar/jar.h diff --git a/src/inkjar/makefile.in b/src/inkjar/makefile.in deleted file mode 100644 index 96834aa2f..000000000 --- a/src/inkjar/makefile.in +++ /dev/null @@ -1,17 +0,0 @@ -# Convenience stub makefile to call the real Makefile. - -@SET_MAKE@ - -OBJEXT = @OBJEXT@ - -# Explicit so that it's the default rule. -all: - cd .. && $(MAKE) inkjar/all - -clean %.a %.$(OBJEXT): - cd .. && $(MAKE) inkjar/$@ - -.PHONY: all clean - -.SUFFIXES: -.SUFFIXES: .a .$(OBJEXT) diff --git a/src/inkjar/jar.cpp b/src/io/inkjar.cpp index 6897cb317..c238aba36 100644 --- a/src/inkjar/jar.cpp +++ b/src/io/inkjar.cpp @@ -48,7 +48,7 @@ #include <glib.h> #include <zlib.h> -#include "jar.h" +#include "inkjar.h" #include <fstream> #ifdef WORDS_BIGENDIAN diff --git a/src/inkjar/jar.h b/src/io/inkjar.h index 0fe088b24..0fe088b24 100644 --- a/src/inkjar/jar.h +++ b/src/io/inkjar.h |