From 1760187fd0f367390ed17f1deebe9c7a48c1415d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oona=20Ra=CC=88isa=CC=88nen?= <oona@kapsi.fi>
Date: Sat, 8 Aug 2015 08:59:29 +0300
Subject: [PATCH] Revert "preparing port to C++11"

This reverts commit a6c59ae5f0090aa6fb6127fadb5827c455c2af31.
---
 Makefile                            | 20 ++++++++++++++++++++
 Makefile.am                         |  2 --
 ui/aboutdialog.ui => aboutdialog.ui |  0
 src/common.cc => common.c           |  0
 src/common.h => common.h            |  0
 configure.ac                        | 10 ----------
 src/fsk.cc => fsk.c                 |  0
 src/gui.cc => gui.c                 |  0
 src/modespec.cc => modespec.c       |  0
 src/pcm.cc => pcm.c                 |  0
 ui/prefs.ui => prefs.ui             |  0
 src/slowrx.cc => slowrx.c           |  0
 ui/slowrx.ui => slowrx.ui           |  2 +-
 src/Makefile.am                     |  4 ----
 src/sync.cc => sync.c               |  0
 src/video.cc => video.c             |  0
 src/vis.cc => vis.c                 |  0
 17 files changed, 21 insertions(+), 17 deletions(-)
 create mode 100644 Makefile
 delete mode 100644 Makefile.am
 rename ui/aboutdialog.ui => aboutdialog.ui (100%)
 rename src/common.cc => common.c (100%)
 rename src/common.h => common.h (100%)
 delete mode 100644 configure.ac
 rename src/fsk.cc => fsk.c (100%)
 rename src/gui.cc => gui.c (100%)
 rename src/modespec.cc => modespec.c (100%)
 rename src/pcm.cc => pcm.c (100%)
 rename ui/prefs.ui => prefs.ui (100%)
 rename src/slowrx.cc => slowrx.c (100%)
 rename ui/slowrx.ui => slowrx.ui (99%)
 delete mode 100644 src/Makefile.am
 rename src/sync.cc => sync.c (100%)
 rename src/video.cc => video.c (100%)
 rename src/vis.cc => vis.c (100%)

diff --git a/Makefile b/Makefile
new file mode 100644
index 0000000..dc38a36
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,20 @@
+CC = gcc
+
+CFLAGS    = -Wall -Wextra -std=gnu99 -pedantic -g -DGDK_VERSION_MIN_REQUIRED=GDK_VERSION_3_4
+GTKCFLAGS = `pkg-config --cflags gtk+-3.0`
+GTKLIBS   = `pkg-config --libs gtk+-3.0`
+
+OFLAGS = -O3
+
+OBJECTS = common.o modespec.o gui.o video.o vis.o sync.o pcm.o fsk.o slowrx.o
+
+all: slowrx
+
+slowrx: $(OBJECTS)
+	$(CC) $(CFLAGS) -o $@ $(OBJECTS) $(GTKLIBS) -lfftw3 -lgthread-2.0 -lasound -lm -lpthread
+
+%.o: %.c common.h
+	$(CC) $(CFLAGS) $(GTKCFLAGS) $(OFLAGS) -c -o $@ $<
+
+clean:
+	rm -f slowrx $(OBJECTS)
diff --git a/Makefile.am b/Makefile.am
deleted file mode 100644
index c6231c2..0000000
--- a/Makefile.am
+++ /dev/null
@@ -1,2 +0,0 @@
-SUBDIRS = src
-dist_doc_DATA = README.md
diff --git a/ui/aboutdialog.ui b/aboutdialog.ui
similarity index 100%
rename from ui/aboutdialog.ui
rename to aboutdialog.ui
diff --git a/src/common.cc b/common.c
similarity index 100%
rename from src/common.cc
rename to common.c
diff --git a/src/common.h b/common.h
similarity index 100%
rename from src/common.h
rename to common.h
diff --git a/configure.ac b/configure.ac
deleted file mode 100644
index bf8f559..0000000
--- a/configure.ac
+++ /dev/null
@@ -1,10 +0,0 @@
-AC_INIT([slowrx], [0.1], [oona@kapsi.fi])
-AM_INIT_AUTOMAKE([-Wall -Werror foreign])
-AC_PROG_CXX
-AC_CONFIG_HEADERS([config.h])
-AC_CONFIG_FILES([
- Makefile
- src/Makefile
-])
-PKG_CHECK_MODULES([GTKMM], [gtkmm-3.0 >= 3.8.0])
-AC_OUTPUT
diff --git a/src/fsk.cc b/fsk.c
similarity index 100%
rename from src/fsk.cc
rename to fsk.c
diff --git a/src/gui.cc b/gui.c
similarity index 100%
rename from src/gui.cc
rename to gui.c
diff --git a/src/modespec.cc b/modespec.c
similarity index 100%
rename from src/modespec.cc
rename to modespec.c
diff --git a/src/pcm.cc b/pcm.c
similarity index 100%
rename from src/pcm.cc
rename to pcm.c
diff --git a/ui/prefs.ui b/prefs.ui
similarity index 100%
rename from ui/prefs.ui
rename to prefs.ui
diff --git a/src/slowrx.cc b/slowrx.c
similarity index 100%
rename from src/slowrx.cc
rename to slowrx.c
diff --git a/ui/slowrx.ui b/slowrx.ui
similarity index 99%
rename from ui/slowrx.ui
rename to slowrx.ui
index 7bc64c7..85e5d62 100644
--- a/ui/slowrx.ui
+++ b/slowrx.ui
@@ -22,7 +22,7 @@
     <property name="resizable">False</property>
     <property name="default_width">885</property>
     <property name="default_height">633</property>
-    <property name="visible">True</property>
+    <property name="has_resize_grip">False</property>
     <signal name="delete-event" handler="delete_event" swapped="no"/>
     <child>
       <object class="GtkBox" id="MainBox">
diff --git a/src/Makefile.am b/src/Makefile.am
deleted file mode 100644
index 3aeacc4..0000000
--- a/src/Makefile.am
+++ /dev/null
@@ -1,4 +0,0 @@
-bin_PROGRAMS = slowrx
-slowrx_CPPFLAGS = $(GTKMM_CFLAGS)
-slowrx_LDADD = $(GTKMM_LIBS)
-slowrx_SOURCES = slowrx.cc common.cc gui.cc fsk.cc modespec.cc pcm.cc sync.cc video.cc vis.cc
diff --git a/src/sync.cc b/sync.c
similarity index 100%
rename from src/sync.cc
rename to sync.c
diff --git a/src/video.cc b/video.c
similarity index 100%
rename from src/video.cc
rename to video.c
diff --git a/src/vis.cc b/vis.c
similarity index 100%
rename from src/vis.cc
rename to vis.c