diff --git a/Makefile b/glib/Makefile similarity index 100% rename from Makefile rename to glib/Makefile diff --git a/glib/glib.pro b/glib/glib.pro new file mode 100644 index 0000000..fcc7c48 --- /dev/null +++ b/glib/glib.pro @@ -0,0 +1,9 @@ +# For QtCreator integration purposes. Not meant for building the project. +TEMPLATE = aux + +HEADERS += sailfishaccesscontrol.h +SOURCES += sailfishaccesscontrol.c + +OTHER_FILES += \ + Makefile \ + sailfishaccesscontrol.pc.tpl \ diff --git a/sailfishaccesscontrol.c b/glib/sailfishaccesscontrol.c similarity index 100% rename from sailfishaccesscontrol.c rename to glib/sailfishaccesscontrol.c diff --git a/sailfishaccesscontrol.h b/glib/sailfishaccesscontrol.h similarity index 100% rename from sailfishaccesscontrol.h rename to glib/sailfishaccesscontrol.h diff --git a/sailfishaccesscontrol.pc.tpl b/glib/sailfishaccesscontrol.pc.tpl similarity index 100% rename from sailfishaccesscontrol.pc.tpl rename to glib/sailfishaccesscontrol.pc.tpl diff --git a/rpm/sailfish-access-control.spec b/rpm/sailfish-access-control.spec index 3e42b47..525d123 100644 --- a/rpm/sailfish-access-control.spec +++ b/rpm/sailfish-access-control.spec @@ -26,7 +26,7 @@ Requires: %{name} = %{version}-%{release} C language headers of the Sailfish Access Control library. %prep -%setup -q -n %{name}-%{version} +%setup -q -n %{name}-%{version}/glib %build make ROOT=%{buildroot} %{_smp_mflags} VERSION=%{version} diff --git a/sailfish-access-control.pro b/sailfish-access-control.pro index c45b3f2..deccf93 100644 --- a/sailfish-access-control.pro +++ b/sailfish-access-control.pro @@ -1,10 +1,7 @@ # For QtCreator integration purposes. Not meant for building the project. -TEMPLATE = aux - -HEADERS += sailfishaccesscontrol.h -SOURCES += sailfishaccesscontrol.c +TEMPLATE = subdir +SUBDIRS = glib qt OTHER_FILES += \ - Makefile \ - sailfishaccesscontrol.pc.tpl \ rpm/sailfish-access-control.spec \ + rpm/sailfish-access-control-qt5.spec \