diff options
| -rw-r--r-- | recordmydesktop/Makefile.am | 5 | ||||
| -rw-r--r-- | recordmydesktop/configure.ac | 1 | ||||
| -rw-r--r-- | recordmydesktop/include/Makefile.am | 1 | ||||
| -rw-r--r-- | recordmydesktop/src/Makefile.am | 18 | ||||
| -rw-r--r-- | recordmydesktop/src/recordmydesktop.h (renamed from recordmydesktop/include/recordmydesktop.h) | 0 | ||||
| -rw-r--r-- | recordmydesktop/src/rmdmacro.h (renamed from recordmydesktop/include/rmdmacro.h) | 0 | ||||
| -rw-r--r-- | recordmydesktop/src/rmdtypes.h (renamed from recordmydesktop/include/rmdtypes.h) | 0 | ||||
| -rw-r--r-- | recordmydesktop/src/skeleton.h (renamed from recordmydesktop/include/skeleton.h) | 0 |
8 files changed, 9 insertions, 16 deletions
diff --git a/recordmydesktop/Makefile.am b/recordmydesktop/Makefile.am index caee5a1..3920780 100644 --- a/recordmydesktop/Makefile.am +++ b/recordmydesktop/Makefile.am @@ -1,4 +1 @@ -SUBDIRS = src doc include - - - +SUBDIRS = src doc diff --git a/recordmydesktop/configure.ac b/recordmydesktop/configure.ac index 69daf37..903f4a7 100644 --- a/recordmydesktop/configure.ac +++ b/recordmydesktop/configure.ac @@ -131,7 +131,6 @@ AC_FUNC_MALLOC AC_CONFIG_FILES([Makefile src/Makefile - include/Makefile doc/Makefile ]) AC_OUTPUT diff --git a/recordmydesktop/include/Makefile.am b/recordmydesktop/include/Makefile.am deleted file mode 100644 index f675c80..0000000 --- a/recordmydesktop/include/Makefile.am +++ /dev/null @@ -1 +0,0 @@ -noinst_HEADERS = recordmydesktop.h rmdtypes.h rmdmacro.h skeleton.h diff --git a/recordmydesktop/src/Makefile.am b/recordmydesktop/src/Makefile.am index 4c80b7c..c77a83e 100644 --- a/recordmydesktop/src/Makefile.am +++ b/recordmydesktop/src/Makefile.am @@ -36,6 +36,7 @@ recordmydesktop_SOURCES = \ queryextensions.c \ queryextensions.h \ recordmydesktop.c \ + recordmydesktop.h \ rectinsert.c \ rectinsert.h \ register_callbacks.c \ @@ -54,11 +55,14 @@ recordmydesktop_SOURCES = \ rmd_timer.h \ rmdthreads.c \ rmdthreads.h \ + rmdmacro.h \ + rmdtypes.h \ setbrwindow.c \ setbrwindow.h \ shortcuts.c \ shortcuts.h \ skeleton.c \ + skeleton.h \ specsfile.c \ specsfile.h \ update_image.c \ @@ -68,17 +72,14 @@ recordmydesktop_SOURCES = \ wm_check.c \ wm_check.h - -INCLUDES = $(all_includes) -I$(top_srcdir)/include - -recordmydesktop_LDFLAGS = @X_LIBS@ @X_EXTRA_LIBS@ @X_PRE_LIBS@ -recordmydesktop_CFLAGS = -D_THREAD_SAFE -pthread -Wall +recordmydesktop_CPPFLAGS = -D_THREAD_SAFE -pthread -Wall +recordmydesktop_LDFLAGS = @X_LIBS@ @X_EXTRA_LIBS@ @X_PRE_LIBS@ # RectInsert test -TESTS = test-rectinsert +TESTS = test-rectinsert EXTRA_PROGRAMS = test-rectinsert -CLEANFILES = $(EXTRA_PROGRAMS) +CLEANFILES = $(EXTRA_PROGRAMS) test_rectinsert_SOURCES = \ test-rectinsert.c \ @@ -87,7 +88,4 @@ test_rectinsert_SOURCES = \ test-rectinsert-types.h \ rectinsert.c -test_rectinsert_CPPFLAGS = \ - -I$(top_srcdir)/include - test_rectinsert_CFLAGS = -Wall diff --git a/recordmydesktop/include/recordmydesktop.h b/recordmydesktop/src/recordmydesktop.h index 3ee6e83..3ee6e83 100644 --- a/recordmydesktop/include/recordmydesktop.h +++ b/recordmydesktop/src/recordmydesktop.h diff --git a/recordmydesktop/include/rmdmacro.h b/recordmydesktop/src/rmdmacro.h index 453fbea..453fbea 100644 --- a/recordmydesktop/include/rmdmacro.h +++ b/recordmydesktop/src/rmdmacro.h diff --git a/recordmydesktop/include/rmdtypes.h b/recordmydesktop/src/rmdtypes.h index f4099ce..f4099ce 100644 --- a/recordmydesktop/include/rmdtypes.h +++ b/recordmydesktop/src/rmdtypes.h diff --git a/recordmydesktop/include/skeleton.h b/recordmydesktop/src/skeleton.h index 9805cdc..9805cdc 100644 --- a/recordmydesktop/include/skeleton.h +++ b/recordmydesktop/src/skeleton.h |