summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristophe Grenier <grenier@cgsecurity.org>2014-11-02 15:50:08 +0100
committerChristophe Grenier <grenier@cgsecurity.org>2014-11-02 15:50:08 +0100
commitd41d56fdbefc1aa802460e740454fb1b38bf901c (patch)
tree4c6a2ab82c7b0bdda6ccc791a422be6c109a1ec9
parent50967cb2ed25cec034580c28c081d771d74e371c (diff)
Rename ico directory to icons
-rw-r--r--Makefile.am4
-rw-r--r--configure.ac1
-rw-r--r--icons/Makefile.am1
-rw-r--r--icons/photorec.ico (renamed from ico/photorec.ico)bin2238 -> 2238 bytes
-rw-r--r--icons/testdisk.ico (renamed from ico/testdisk.ico)bin7406 -> 7406 bytes
-rw-r--r--src/Makefile.am6
-rw-r--r--src/icon_ph.rc2
-rw-r--r--src/icon_qph.rc2
-rw-r--r--src/icon_tst.rc2
9 files changed, 9 insertions, 9 deletions
diff --git a/Makefile.am b/Makefile.am
index aa18c41..64bfeb5 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,12 +1,10 @@
-
-SUBDIRS = src man
+SUBDIRS = icons man src
EXTRA_DIST = AUTHORS COPYING ChangeLog INFO INSTALL NEWS README THANKS compile.sh \
progsreiserfs-journal.patch progsreiserfs-file-read.patch \
darwin/readme_mac_powerpc.txt darwin/readme_mac_intel.txt \
documentation.html \
dos/readme.txt \
- ico/photorec.ico ico/testdisk.ico \
linux/testdisk.spec.in \
src/icon_ph.rc src/icon_qph.rc src/icon_tst.rc \
src/photorec_64x64.png \
diff --git a/configure.ac b/configure.ac
index 9fd7731..7695708 100644
--- a/configure.ac
+++ b/configure.ac
@@ -886,6 +886,7 @@ AC_SUBST(qphotorec_LDADD)
AC_SUBST(qphotorec_CXXFLAGS)
AC_CONFIG_FILES([
Makefile
+ icons/Makefile
src/Makefile
man/Makefile
man/testdisk.8 man/photorec.8 man/qphotorec.8 man/fidentify.8
diff --git a/icons/Makefile.am b/icons/Makefile.am
new file mode 100644
index 0000000..c260fa0
--- /dev/null
+++ b/icons/Makefile.am
@@ -0,0 +1 @@
+EXTRA_DIST = photorec.ico testdisk.ico
diff --git a/ico/photorec.ico b/icons/photorec.ico
index 74aa854..74aa854 100644
--- a/ico/photorec.ico
+++ b/icons/photorec.ico
Binary files differ
diff --git a/ico/testdisk.ico b/icons/testdisk.ico
index ebee59a..ebee59a 100644
--- a/ico/testdisk.ico
+++ b/icons/testdisk.ico
Binary files differ
diff --git a/src/Makefile.am b/src/Makefile.am
index d3ef52b..60db6fb 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -2,9 +2,9 @@
$(WINDRES) --include-dir $(srcdir) $< $@
if USEICON
-ICON_TESTDISK=icon_tst.rc ../ico/testdisk.ico
-ICON_PHOTOREC=icon_ph.rc ../ico/photorec.ico
-ICON_QPHOTOREC=icon_qph.rc ../ico/photorec.ico
+ICON_TESTDISK=icon_tst.rc ../icons/testdisk.ico ../win/testdisk_win.exe.manifest
+ICON_PHOTOREC=icon_ph.rc ../icons/photorec.ico ../win/photorec_win.exe.manifest
+ICON_QPHOTOREC=icon_qph.rc ../icons/photorec.ico ../win/qphotorec_win.exe.manifest
endif
if USEQT
diff --git a/src/icon_ph.rc b/src/icon_ph.rc
index eff6e21..43a57d6 100644
--- a/src/icon_ph.rc
+++ b/src/icon_ph.rc
@@ -1,4 +1,4 @@
-app ICON DISCARDABLE "../ico/photorec.ico"
+app ICON DISCARDABLE "../icons/photorec.ico"
//CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST MOVEABLE PURE "../win/photorec_win.exe.manifest"
1 24 "../win/photorec_win.exe.manifest"
diff --git a/src/icon_qph.rc b/src/icon_qph.rc
index 039e7bf..83b4386 100644
--- a/src/icon_qph.rc
+++ b/src/icon_qph.rc
@@ -1,4 +1,4 @@
-app ICON DISCARDABLE "../ico/photorec.ico"
+app ICON DISCARDABLE "../icons/photorec.ico"
//CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST MOVEABLE PURE "../win/qphotorec_win.exe.manifest"
1 24 "../win/qphotorec_win.exe.manifest"
diff --git a/src/icon_tst.rc b/src/icon_tst.rc
index 9738548..f5276dc 100644
--- a/src/icon_tst.rc
+++ b/src/icon_tst.rc
@@ -1,4 +1,4 @@
-app ICON DISCARDABLE "../ico/testdisk.ico"
+app ICON DISCARDABLE "../icons/testdisk.ico"
//CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST MOVEABLE PURE "../win/testdisk_win.exe.manifest"
1 24 MOVEABLE PURE "../win/testdisk_win.exe.manifest"